diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-19 17:30:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-12-19 17:30:43 +0100 |
| commit | 00d2ac3d712fb037411e9856e8174e9d55b5bdbc (patch) | |
| tree | 9d439fc87eeef077bda652e9ce332182c139fc60 /tcps_sess.c | |
| parent | b80b0672beb9b8b4d07791791bb9f2fb7c73889a (diff) | |
| parent | 55db71963e312634f78c25b61dd4800036fe25f9 (diff) | |
| download | rsyslog-00d2ac3d712fb037411e9856e8174e9d55b5bdbc.tar.gz rsyslog-00d2ac3d712fb037411e9856e8174e9d55b5bdbc.tar.xz rsyslog-00d2ac3d712fb037411e9856e8174e9d55b5bdbc.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
action.c
plugins/imudp/imudp.c
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions