diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
| commit | 398966be6d5a94d2602a08305b0533bf4a502a95 (patch) | |
| tree | 6d2a7458311963fb4393ecc8549e1ece2062a7e5 /runtime/rsyslog.h | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
| download | rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.gz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.xz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/diag.sh
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions