summaryrefslogtreecommitdiffstats
path: root/tcpsrv.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-09-08 13:38:02 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-09-08 13:38:02 +0200
commit304ab88dd64b2ae46554fa5394aa8822194b1e95 (patch)
tree9185445b00199c1f486bcca51fddd6b252bf8dd3 /tcpsrv.c
parentd25f7d99f587ea20eb8d39ff6e2cffb6bdbc1c62 (diff)
parent947e5632039d1dd2ef3ae22ac45b17370bbac24d (diff)
downloadrsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.tar.gz
rsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.tar.xz
rsyslog-304ab88dd64b2ae46554fa5394aa8822194b1e95.zip
Merge branch 'v5-devel'
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'tcpsrv.c')
0 files changed, 0 insertions, 0 deletions