diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 12:25:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 12:25:22 +0200 |
| commit | 189c0284c11f8a9a689baf0c1f122a06a421058b (patch) | |
| tree | b152441d2878414d6a1ca3875d662906b1ac325a /tcps_sess.h | |
| parent | b52b7a15168e43758a814b36b497f658ebb56ff3 (diff) | |
| parent | c897ac6e6de3b430911cad71e7453d8b4b3c57bc (diff) | |
| download | rsyslog-189c0284c11f8a9a689baf0c1f122a06a421058b.tar.gz rsyslog-189c0284c11f8a9a689baf0c1f122a06a421058b.tar.xz rsyslog-189c0284c11f8a9a689baf0c1f122a06a421058b.zip | |
Merge branch 'v4-devel' into tmp
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
tcpsrv.c
Diffstat (limited to 'tcps_sess.h')
0 files changed, 0 insertions, 0 deletions