diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 10:27:55 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 10:27:55 +0200 |
commit | f7f7d951fcbaa0f30b43c651dae36bcf31c91e78 (patch) | |
tree | 6b3cdb26c631d28f743ee44894d0ff19669b009b /runtime/queue.c | |
parent | 8d8d1f01e1cd6ae372088a3ebddc27983e9a0185 (diff) | |
parent | 4c8546fd6fb56d5439edb5a098c8f82bc8fc36aa (diff) | |
download | rsyslog-f7f7d951fcbaa0f30b43c651dae36bcf31c91e78.tar.gz rsyslog-f7f7d951fcbaa0f30b43c651dae36bcf31c91e78.tar.bz2 rsyslog-f7f7d951fcbaa0f30b43c651dae36bcf31c91e78.zip |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
tcpsrv.c
Diffstat (limited to 'runtime/queue.c')
0 files changed, 0 insertions, 0 deletions