diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-13 18:24:19 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-13 18:24:19 +0100 |
| commit | b96693cef7343aaf0406fc242ebd17c8981051d5 (patch) | |
| tree | 9e4e1ee8cf477478122fa7504afc42b510f25108 /plugins/imtcp/imtcp.c | |
| parent | 3495720a2f6bc69ccba4c0d978ee815812cc9b75 (diff) | |
| parent | 153998322ba0ae970586658c0f89e6123f891e00 (diff) | |
| download | rsyslog-b96693cef7343aaf0406fc242ebd17c8981051d5.tar.gz rsyslog-b96693cef7343aaf0406fc242ebd17c8981051d5.tar.bz2 rsyslog-b96693cef7343aaf0406fc242ebd17c8981051d5.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions