diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-14 13:53:25 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-14 13:53:25 +0100 |
| commit | 1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea (patch) | |
| tree | f929f411af355f227b60f7eddd0b031445596953 /tcpsrv.h | |
| parent | 2c7604f45b1c416180794f2c4f29ba25504f8d47 (diff) | |
| parent | 7d516b0a6c46177c18aea30b4617f1d2712d48fd (diff) | |
| download | rsyslog-1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea.tar.gz rsyslog-1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea.tar.xz rsyslog-1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
configure.ac
Diffstat (limited to 'tcpsrv.h')
0 files changed, 0 insertions, 0 deletions