summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-30 13:12:39 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-30 13:12:39 +0100
commit7faeff73ddba0cfcf5accca2bbc2b1e2330d8621 (patch)
tree14a79231d11c03893c8f013998b7bdcd523e6161 /plugins/imtcp/imtcp.c
parentb11c85aac8b41eb74fb14c486f88940df8819bbc (diff)
parentad1b93df8a83563c23d44ea0df910dd25d26a9d9 (diff)
downloadrsyslog-7faeff73ddba0cfcf5accca2bbc2b1e2330d8621.tar.gz
rsyslog-7faeff73ddba0cfcf5accca2bbc2b1e2330d8621.tar.bz2
rsyslog-7faeff73ddba0cfcf5accca2bbc2b1e2330d8621.zip
Merge branch 'v7-stable'
Conflicts: configure.ac doc/manual.html
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions