summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-11 17:39:44 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-11 17:39:44 +0200
commitff429be0f6254d40c52150dbf8142330ba754ea7 (patch)
tree117944b9fc310f7f1c784dd11dd1e8cefac6de16 /plugins/imtcp/imtcp.c
parentd5585524b7c749c1bbecf1e68b06269be82583e2 (diff)
parent85dea8048aed1b2d74eec57b30155898892daa37 (diff)
downloadrsyslog-ff429be0f6254d40c52150dbf8142330ba754ea7.tar.gz
rsyslog-ff429be0f6254d40c52150dbf8142330ba754ea7.tar.bz2
rsyslog-ff429be0f6254d40c52150dbf8142330ba754ea7.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions