diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-07 15:14:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-07 15:14:49 +0100 |
| commit | 353bcab3beff4d42d2440c67b66874cc1e970995 (patch) | |
| tree | e9466fc112a9b943e79ab18f25eedf9dd9f506d6 /plugins/imtcp | |
| parent | ada1fdfbaefd279da1c580b50b413234f793487b (diff) | |
| parent | 06764f3beda12b3f2bbb9f05d9ce1ba77cb2ddc8 (diff) | |
| download | rsyslog-353bcab3beff4d42d2440c67b66874cc1e970995.tar.gz rsyslog-353bcab3beff4d42d2440c67b66874cc1e970995.tar.bz2 rsyslog-353bcab3beff4d42d2440c67b66874cc1e970995.zip | |
Merge branch 'v7-stable'
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imtcp')
0 files changed, 0 insertions, 0 deletions