summaryrefslogtreecommitdiffstats
path: root/tcps_sess.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-09 10:54:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-09 10:54:58 +0200
commit550afa1fefcf1c9a0d44c72c3f51fc15cd33df10 (patch)
tree3cf5cab1e89a0a1db925c18f1ac0fa54a11b96cb /tcps_sess.c
parentb6884a3e1bd22eda94afae687a9a07378eac5318 (diff)
parent89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff)
downloadrsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.tar.gz
rsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.tar.xz
rsyslog-550afa1fefcf1c9a0d44c72c3f51fc15cd33df10.zip
Merge branch 'v4-devel'
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions