diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:39:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:39:09 +0100 |
| commit | 603c5f62fad710f035d385d046c843d8bf6e40ef (patch) | |
| tree | aa5cfe9f0be4d615b0052617807b5a0c0cf4187a /tcps_sess.c | |
| parent | 7dfc7c709ffe09669e8c79661faea21451cca603 (diff) | |
| parent | cc0da38a4becfd5a152438823437f671234e3a3b (diff) | |
| download | rsyslog-603c5f62fad710f035d385d046c843d8bf6e40ef.tar.gz rsyslog-603c5f62fad710f035d385d046c843d8bf6e40ef.tar.xz rsyslog-603c5f62fad710f035d385d046c843d8bf6e40ef.zip | |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions