diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:03:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:03:51 +0100 |
| commit | 0b5fe246b55635d8eaf3182ddad8961c7d3757c2 (patch) | |
| tree | 2e9c645db556827d616410833a01e448358aa3fd /plugins/imtcp/imtcp.c | |
| parent | 2f8cd1aba769c536cebdebc26c20b9a6b1b00fad (diff) | |
| parent | 16cc84fc699fc3f830b0c28d677d6ae0daa35723 (diff) | |
| download | rsyslog-0b5fe246b55635d8eaf3182ddad8961c7d3757c2.tar.gz rsyslog-0b5fe246b55635d8eaf3182ddad8961c7d3757c2.tar.bz2 rsyslog-0b5fe246b55635d8eaf3182ddad8961c7d3757c2.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