diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 15:21:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-16 15:21:08 +0200 |
| commit | 3946d0f8dfaa629665b20c1f99ad16d5d254f266 (patch) | |
| tree | e0bba518fb8980eedd72a6587509eaab296ccf39 /runtime/conf.c | |
| parent | a0c9fcfc77fb6b6bfa51a60760fd56a500f0083e (diff) | |
| parent | 6ed28016ca1a98f183f72d1d381a5027949ca965 (diff) | |
| download | rsyslog-3946d0f8dfaa629665b20c1f99ad16d5d254f266.tar.gz rsyslog-3946d0f8dfaa629665b20c1f99ad16d5d254f266.tar.xz rsyslog-3946d0f8dfaa629665b20c1f99ad16d5d254f266.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
plugins/imuxsock/imuxsock.c
Diffstat (limited to 'runtime/conf.c')
0 files changed, 0 insertions, 0 deletions