diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-14 13:44:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-14 13:44:35 +0100 |
| commit | e482c13b50b8723f433bc3ff594f28cb2a070818 (patch) | |
| tree | 5388158e2939085c6bc8de7323a6aed80546aac7 /tcps_sess.h | |
| parent | 5ecfdad17e395570edb78698b4805992368c61b1 (diff) | |
| parent | e6aaf19689791c668ea444a21e470e4db3244cb5 (diff) | |
| download | rsyslog-e482c13b50b8723f433bc3ff594f28cb2a070818.tar.gz rsyslog-e482c13b50b8723f433bc3ff594f28cb2a070818.tar.xz rsyslog-e482c13b50b8723f433bc3ff594f28cb2a070818.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
plugins/imuxsock/imuxsock.c
runtime/queue.c
runtime/queue.h
Diffstat (limited to 'tcps_sess.h')
0 files changed, 0 insertions, 0 deletions