summaryrefslogtreecommitdiffstats
path: root/plugins/imtcp/imtcp.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-16 11:15:52 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-16 11:15:52 +0200
commit08ba763c248b2ac3d5fb95fe3419bd8488d0d489 (patch)
treecba546aeea3079a71dda948d2afcd3158cebd894 /plugins/imtcp/imtcp.c
parentacea81df104eacdae51d3e05ce3285080797dca5 (diff)
parent5fd3d8e59334fac9bb21062d66d83fce511c8af9 (diff)
downloadrsyslog-08ba763c248b2ac3d5fb95fe3419bd8488d0d489.tar.gz
rsyslog-08ba763c248b2ac3d5fb95fe3419bd8488d0d489.tar.bz2
rsyslog-08ba763c248b2ac3d5fb95fe3419bd8488d0d489.zip
Merge branch 'c10'
Conflicts: configure.ac doc/rsyslog_conf_modules.html
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions