diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:42:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:42:54 +0200 |
| commit | bd8d972a975ce794dd71c1c8db724991dd4744a0 (patch) | |
| tree | 1dcf15151118890be2cc1506426c665bbc138933 /tcps_sess.c | |
| parent | bfc6f6d599a4723b26708da5fddcc6db5c53fc21 (diff) | |
| parent | eef1701be28f8f8b00134e6c20a8a493d0e69f80 (diff) | |
| download | rsyslog-bd8d972a975ce794dd71c1c8db724991dd4744a0.tar.gz rsyslog-bd8d972a975ce794dd71c1c8db724991dd4744a0.tar.bz2 rsyslog-bd8d972a975ce794dd71c1c8db724991dd4744a0.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
configure.ac
Diffstat (limited to 'tcps_sess.c')
0 files changed, 0 insertions, 0 deletions