summaryrefslogtreecommitdiffstats
path: root/tcps_sess.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-09 09:15:14 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-09 09:15:14 +0100
commitde7726cbf0957384cc9261ac47d6bf65906739b5 (patch)
tree1d3dd581d5c2382c01d3bf39130b368ae0cc64e2 /tcps_sess.c
parenta27c67a590a4a6186ac79326fa3abe4b95ab10fc (diff)
parentd97ad63e218112d7cd3a390854b2918407804976 (diff)
downloadrsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.gz
rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.xz
rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: ChangeLog runtime/datetime.h
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions