diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-27 12:33:26 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-27 12:33:26 +0200 |
| commit | 8488d8c3c1e65cb4dacb1dddc71c9186ec9f8f37 (patch) | |
| tree | 9f612b2808a1590e48cd0f43cb85efca3bb6f83f /sample.conf | |
| parent | 2bd4e10a4dc909346d5a010edefb12c65ed77aec (diff) | |
| parent | 47729f3b9362f7956c936088ac4bb703633cb33b (diff) | |
| download | rsyslog-8488d8c3c1e65cb4dacb1dddc71c9186ec9f8f37.tar.gz rsyslog-8488d8c3c1e65cb4dacb1dddc71c9186ec9f8f37.tar.xz rsyslog-8488d8c3c1e65cb4dacb1dddc71c9186ec9f8f37.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imfile/imfile.c
plugins/imklog/imklog.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
plugins/imuxsock/imuxsock.c
plugins/mmsnmptrapd/mmsnmptrapd.c
tools/omfile.c
Diffstat (limited to 'sample.conf')
0 files changed, 0 insertions, 0 deletions