diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-03 14:48:24 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-05-03 14:48:24 +0200 |
commit | aa31459b15981c00f0e4807e0565ecdcc3f6bf6c (patch) | |
tree | 714672c691220ee9e9fa75ea3381cad9fefc02bb /doc/direct_queue0.png | |
parent | 315288a4c07965f9320dba9d357ba136f6e47282 (diff) | |
parent | 1ab2bb26d20eaffc36999cb2bb1d7c9be3994c56 (diff) | |
download | rsyslog-aa31459b15981c00f0e4807e0565ecdcc3f6bf6c.tar.gz rsyslog-aa31459b15981c00f0e4807e0565ecdcc3f6bf6c.tar.xz rsyslog-aa31459b15981c00f0e4807e0565ecdcc3f6bf6c.zip |
Merge branch 'v4-devel'v5.5.4
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/direct_queue0.png')
0 files changed, 0 insertions, 0 deletions