summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-21 14:47:18 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-21 14:47:18 +0200
commitf3d4d83ce5a921899775eb59997d9d954b2f423d (patch)
treebb4af3cf3eea8733efa7ffd29586e23b54f1ff23 /plugins/imtcp/imtcp.c
parentbb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d (diff)
parent5d67d98c35da731eab933dbfd858a0e009aa58de (diff)
downloadrsyslog-f3d4d83ce5a921899775eb59997d9d954b2f423d.tar.gz
rsyslog-f3d4d83ce5a921899775eb59997d9d954b2f423d.tar.bz2
rsyslog-f3d4d83ce5a921899775eb59997d9d954b2f423d.zip
Merge branch 'v5-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions