diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:34:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:34:08 +0200 |
| commit | 9105946272e4190e042981f35994b3f044ebb0d3 (patch) | |
| tree | 3881710f80a8c6fa9abeca244ce378808bce409c /tcps_sess.c | |
| parent | 0edf73f88096f3656da466027417d04ce7a2511c (diff) | |
| parent | 959b777a0ae6fa01cd8d67397808008a7ce29fcd (diff) | |
| download | rsyslog-9105946272e4190e042981f35994b3f044ebb0d3.tar.gz rsyslog-9105946272e4190e042981f35994b3f044ebb0d3.tar.xz rsyslog-9105946272e4190e042981f35994b3f044ebb0d3.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions