summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-03-31 20:06:10 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-03-31 20:06:10 +0200
commit3b9fd5330a6599c00e9c3c0a4080a141f173aa6a (patch)
treef01a660c1ccf5070101b32a9e7eb75e07c0c6e57 /doc
parent3e3a9bc9982331e44cf397fef131e75553f2ab2c (diff)
parent91d6888a8afe562bf4d2ef53be94c41898e1a2ec (diff)
downloadrsyslog-3b9fd5330a6599c00e9c3c0a4080a141f173aa6a.tar.gz
rsyslog-3b9fd5330a6599c00e9c3c0a4080a141f173aa6a.tar.xz
rsyslog-3b9fd5330a6599c00e9c3c0a4080a141f173aa6a.zip
Merge branch 'master' into sol-test
Conflicts: tests/Makefile.am
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions