diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-16 11:15:52 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-16 11:15:52 +0200 |
commit | 08ba763c248b2ac3d5fb95fe3419bd8488d0d489 (patch) | |
tree | cba546aeea3079a71dda948d2afcd3158cebd894 /plugins/imtcp/imtcp.c | |
parent | acea81df104eacdae51d3e05ce3285080797dca5 (diff) | |
parent | 5fd3d8e59334fac9bb21062d66d83fce511c8af9 (diff) | |
download | rsyslog-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