summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:09:08 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:09:08 +0200
commita3953fbee90045b96bd5ef44b64883a6bff57fee (patch)
treef89f77d1a51189c6e131b4a13a1d6faeb346b20f /tools
parent1234d7c8cd5d76862510cff315ea965c4f978e55 (diff)
parent3229fbeb1e1183141cbf2508334a52f6a082c40b (diff)
downloadrsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.tar.gz
rsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.tar.xz
rsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.zip
Merge branch 'v3-stable' into v4-stable
Conflicts: runtime/msg.c
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions