diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:29:00 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:29:00 +0200 |
commit | f4156b878f5e29d13bc4d98b78a7063008c6ad2b (patch) | |
tree | a57cf718162aca1a9f24d5347d25a46ec0ef6996 /runtime/queue.c | |
parent | cbdc18da79c2ee672ef59e443a9c0039fdf87bc1 (diff) | |
parent | 7dcd960d30e8a31ad5f29ecc17fe276b95873a3d (diff) | |
download | rsyslog-f4156b878f5e29d13bc4d98b78a7063008c6ad2b.tar.gz rsyslog-f4156b878f5e29d13bc4d98b78a7063008c6ad2b.tar.bz2 rsyslog-f4156b878f5e29d13bc4d98b78a7063008c6ad2b.zip |
Merge branch 'v4-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_global.html
tools/syslogd.c
Diffstat (limited to 'runtime/queue.c')
0 files changed, 0 insertions, 0 deletions