summaryrefslogtreecommitdiffstats
path: root/tools/omfwd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-04 10:19:47 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-04 10:19:47 +0200
commitcf1289737659a8a807419b51566613c9fb776005 (patch)
tree7239a6e6fe4d44bcc6b8a8a2b56c067779e42452 /tools/omfwd.c
parent92d10abc1b66907f84b82d2d34552a90b852aa5f (diff)
parent58e707b441aea88cd318762e6968e1db1211f949 (diff)
downloadrsyslog-cf1289737659a8a807419b51566613c9fb776005.tar.gz
rsyslog-cf1289737659a8a807419b51566613c9fb776005.tar.xz
rsyslog-cf1289737659a8a807419b51566613c9fb776005.zip
Merge branch 'master' into v5-devel
Conflicts: runtime/rsyslog.h tests/Makefile.am
Diffstat (limited to 'tools/omfwd.c')
0 files changed, 0 insertions, 0 deletions