summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-24 10:11:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-24 10:11:41 +0200
commiteece1c3cd1c7379fbfabaa75444b0b5275a0886b (patch)
tree1d30c62d0de633bab2531daec0638c791c2a146e /tools
parenta48918cc2783f4351b246c97cd9669abb9d0de47 (diff)
parent2d548d56c2cb5c4018994a9e3bae306bdf35f38f (diff)
downloadrsyslog-eece1c3cd1c7379fbfabaa75444b0b5275a0886b.tar.gz
rsyslog-eece1c3cd1c7379fbfabaa75444b0b5275a0886b.tar.xz
rsyslog-eece1c3cd1c7379fbfabaa75444b0b5275a0886b.zip
Merge branch 'v4-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions