summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-01-13 12:48:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-01-13 12:48:59 +0100
commit88e01dc3ffe86d51cff87ca3a0d6b56e5fbcc68b (patch)
tree353ebd42f86421327c7b6997580b6c8de862cf2e /tools
parent58870fc483c441fba4a87b8411642ea5bc8a7e74 (diff)
parentb7ea09361c7618b1a1c8a7f0b9d0b7f2b1414884 (diff)
downloadrsyslog-88e01dc3ffe86d51cff87ca3a0d6b56e5fbcc68b.tar.gz
rsyslog-88e01dc3ffe86d51cff87ca3a0d6b56e5fbcc68b.tar.xz
rsyslog-88e01dc3ffe86d51cff87ca3a0d6b56e5fbcc68b.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions