diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-23 12:35:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-23 12:35:27 +0200 |
| commit | 92b8ffe5cdbde02f2651814adb64534ffe5ea70e (patch) | |
| tree | 6f12b660e12ec37bb9b5d270d602a831c572d23e /plugins/imtcp/imtcp.c | |
| parent | 32a882199a929b92bbc0b36c3e2d7d92c93d6e41 (diff) | |
| parent | 7fb358a76f2c6dd86b951cb1639d1787810830c2 (diff) | |
| download | rsyslog-92b8ffe5cdbde02f2651814adb64534ffe5ea70e.tar.gz rsyslog-92b8ffe5cdbde02f2651814adb64534ffe5ea70e.tar.bz2 rsyslog-92b8ffe5cdbde02f2651814adb64534ffe5ea70e.zip | |
Merge branch 'v6-stable' into v6-devel
Conflicts:
runtime/glbl.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions