summaryrefslogtreecommitdiffstats
path: root/tcps_sess.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-31 16:30:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-31 16:30:13 +0200
commit945bc9bd0d9de984ab11b9faf609b809a1f3cb90 (patch)
treef3464946b2eef29b2f8a4e54c32f7bf063a2c27f /tcps_sess.c
parentf057fb2db388cc16475f9c5a7de64aeb1f3bdb43 (diff)
parenteccfbf71f9dbc235309c2ad40035d41620f5e5df (diff)
downloadrsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.gz
rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.tar.xz
rsyslog-945bc9bd0d9de984ab11b9faf609b809a1f3cb90.zip
Merge branch 'v5-beta' into v5-devel
Conflicts: ChangeLog
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions