summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-01-09 17:54:25 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-01-09 17:54:25 +0100
commitea1bceb8cc849fbd8423ffe12a8e156611bc531f (patch)
tree434da3af857c88645029f7bd1ee7b7c00b8e0b1c /plugins/imtcp/imtcp.c
parentdcf3e763194fce727ac3050bf6d2adbeef983530 (diff)
parentb6249c44616cd828c2d53506109b50afd2e61839 (diff)
downloadrsyslog-ea1bceb8cc849fbd8423ffe12a8e156611bc531f.tar.gz
rsyslog-ea1bceb8cc849fbd8423ffe12a8e156611bc531f.tar.bz2
rsyslog-ea1bceb8cc849fbd8423ffe12a8e156611bc531f.zip
Merge branch 'v7-stable' into v7-stable-libnet-frag
Conflicts: ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions