summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-08 14:27:20 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-08 14:27:20 +0100
commit06387e5592ffb4f7b20ea631f0824ff2cc652c20 (patch)
treedc964b62013bf67dc18c73d3fc1f3a97e931fed0 /plugins/imtcp/imtcp.c
parentb4cdb7c997eee95df96321d11d03cf90e4a6caba (diff)
parent0b84d47f7a244c25f63fadcec92d12ebfbe319a4 (diff)
downloadrsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.tar.gz
rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.tar.bz2
rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.zip
Merge branch 'v4-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html tests/rt-init.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions