diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:00:21 +0100 |
| commit | f90675f33f33b8a83046f8a8462dd8dbe7648a4a (patch) | |
| tree | f695e6371b52141de4c4ce2295b317a1e487e7b3 /plugins/imtcp/imtcp.c | |
| parent | 14d415e4a84e2c08df1b23a86959f0d9b0006687 (diff) | |
| parent | 74e09afd6db56f6e23c965f0949cfb9979928f13 (diff) | |
| download | rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.gz rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.tar.bz2 rsyslog-f90675f33f33b8a83046f8a8462dd8dbe7648a4a.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
action.c
configure.ac
doc/imuxsock.html
doc/manual.html
runtime/queue.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions