diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 18:10:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-19 18:10:20 +0100 |
| commit | 2ee2cff538edd5e2b70a03fcef76e25b2072e432 (patch) | |
| tree | 43724318361efc2ebb6cbe037295e09d4796a815 /slackware | |
| parent | 1d0dec9b0cf1203dec0cacc0c6eb38d2ac9271ea (diff) | |
| parent | 4fb7ba113c4d4afd485feb2729c5ff67bc8ddd4a (diff) | |
| download | rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.gz rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.tar.xz rsyslog-2ee2cff538edd5e2b70a03fcef76e25b2072e432.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
plugins/imtcp/imtcp.c
tcpsrv.h
Diffstat (limited to 'slackware')
0 files changed, 0 insertions, 0 deletions