diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-23 09:41:00 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-23 09:41:00 +0200 |
commit | 1c4074259a1b9437ac7bd24b4e791dc98375209f (patch) | |
tree | 5b338018628e1ea869854adc2f7ac3e21efd5bca /plugins/imtcp/imtcp.c | |
parent | 2a4c68954b717b8c09221a86794c8a5573120726 (diff) | |
parent | be0a6eb45830f486ea2ac755ee11f7503454aa08 (diff) | |
download | rsyslog-1c4074259a1b9437ac7bd24b4e791dc98375209f.tar.gz rsyslog-1c4074259a1b9437ac7bd24b4e791dc98375209f.tar.bz2 rsyslog-1c4074259a1b9437ac7bd24b4e791dc98375209f.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions