summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-20 16:16:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-20 16:16:28 +0200
commitf0f0db1e65683c1ec44096692578bf1a5d652275 (patch)
treefc431b4d2235cadaa2370d7166ff5ec97a3ff439 /plugins/imtcp
parent534e07d738fc5c7f5464ab94a010cc7113dfad2c (diff)
downloadrsyslog-f0f0db1e65683c1ec44096692578bf1a5d652275.tar.gz
rsyslog-f0f0db1e65683c1ec44096692578bf1a5d652275.tar.bz2
rsyslog-f0f0db1e65683c1ec44096692578bf1a5d652275.zip
fixed broken merge
Diffstat (limited to 'plugins/imtcp')
0 files changed, 0 insertions, 0 deletions