diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-20 16:52:58 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-20 16:52:58 +0100 |
| commit | cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1 (patch) | |
| tree | 1d242f4ad783a0b809ba442f0fc32a316818621d /doc/rsyslog_conf_global.html | |
| parent | 2ee2cff538edd5e2b70a03fcef76e25b2072e432 (diff) | |
| parent | c6714bc496a2aaf356d8625784f10168d33859a3 (diff) | |
| download | rsyslog-cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1.tar.gz rsyslog-cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1.tar.xz rsyslog-cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
ChangeLog
plugins/imptcp/imptcp.c
Diffstat (limited to 'doc/rsyslog_conf_global.html')
0 files changed, 0 insertions, 0 deletions