summaryrefslogtreecommitdiffstats
path: root/tcps_sess.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-23 11:48:47 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-23 11:48:47 +0200
commit925a5e34718cc842cb7e7ea6a5c8e8e8fbeb25dd (patch)
tree0496ccadf7727f18aaa117ea9eb81fd79c98c652 /tcps_sess.c
parent029218df5b7fbd6a7e4f945ecd32f84236885f53 (diff)
parentf8d9aad08222f59ba2d27437c1e2369896452aa1 (diff)
downloadrsyslog-925a5e34718cc842cb7e7ea6a5c8e8e8fbeb25dd.tar.gz
rsyslog-925a5e34718cc842cb7e7ea6a5c8e8e8fbeb25dd.tar.xz
rsyslog-925a5e34718cc842cb7e7ea6a5c8e8e8fbeb25dd.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions