summaryrefslogtreecommitdiffstats
path: root/tools/omfwd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-03 18:28:54 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-03 18:28:54 +0200
commit4f70113457993c536fc948d5b3b3e69dc7a92a8a (patch)
tree5682fe05ddeb53f20a28e02c3190185ce763cd8d /tools/omfwd.c
parent6e28d86c6a0a0c5788c5cb263b71aab19eb54cb5 (diff)
parentfe8ac119f75bc6d2763896b8e1a85ecfeb41bffb (diff)
downloadrsyslog-4f70113457993c536fc948d5b3b3e69dc7a92a8a.tar.gz
rsyslog-4f70113457993c536fc948d5b3b3e69dc7a92a8a.tar.xz
rsyslog-4f70113457993c536fc948d5b3b3e69dc7a92a8a.zip
Merge branch 'v5-stable' into v6-stable
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tools/omfwd.c')
0 files changed, 0 insertions, 0 deletions