summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-22 10:29:51 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-22 10:29:51 +0200
commit041f1fe09ff1cb7aed5a522783cc628c409e3ea4 (patch)
tree5a798e0bcf297e89c0a09f4393caf29920ef3005 /plugins/imtcp/imtcp.c
parentd82327c9547c6fb2dcd6d1820c81e4da72c9531b (diff)
parent316ad4e4c998865cdc90f7c2d0589578c67e5824 (diff)
downloadrsyslog-041f1fe09ff1cb7aed5a522783cc628c409e3ea4.tar.gz
rsyslog-041f1fe09ff1cb7aed5a522783cc628c409e3ea4.tar.bz2
rsyslog-041f1fe09ff1cb7aed5a522783cc628c409e3ea4.zip
Merge branch 'beta-newgrammar'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions