diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 11:07:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-29 11:07:15 +0200 |
| commit | 8b9cef552de558ecfd130451c4dea22676184d38 (patch) | |
| tree | d3b40f3bfc34f32bffbc08668dddd6c4e1a724d3 /tcpsrv.c | |
| parent | de7726cbf0957384cc9261ac47d6bf65906739b5 (diff) | |
| parent | b6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff) | |
| download | rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.gz rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.tar.xz rsyslog-8b9cef552de558ecfd130451c4dea22676184d38.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/debug.c
runtime/stream.c
tests/Makefile.am
tests/diskqueue.sh
tests/nettester.c
tools/omfile.c
Diffstat (limited to 'tcpsrv.c')
0 files changed, 0 insertions, 0 deletions