diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-17 16:51:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-17 16:51:59 +0200 |
| commit | db21912aa81b416dffc1b2814ccd768dab7cfac1 (patch) | |
| tree | 8d5e856de2d47197d7ac0a52a08d585ec4f3c1cc /plugins/imtcp/imtcp.c | |
| parent | bdc609639eae599d2c63bc0ba26a8c70ce718551 (diff) | |
| parent | 1e4ca690525ec4a547ad0fe3efbcd6d059dda15d (diff) | |
| download | rsyslog-db21912aa81b416dffc1b2814ccd768dab7cfac1.tar.gz rsyslog-db21912aa81b416dffc1b2814ccd768dab7cfac1.tar.bz2 rsyslog-db21912aa81b416dffc1b2814ccd768dab7cfac1.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions