diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:02:02 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:02:02 +0200 |
| commit | b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd (patch) | |
| tree | 73ca6650dcd8639a16d5c534bdead1f6cb19b539 /syslog-tst.conf | |
| parent | 6625a8790d3e89b3ecc0612cf08fc917b9631398 (diff) | |
| parent | 1d41b9540ccf8b6714135737855ab71ee75f4364 (diff) | |
| download | rsyslog-b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd.tar.gz rsyslog-b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd.tar.xz rsyslog-b1fe03c82f0c3fbb9ec7209922fbdc2deeec0bdd.zip | |
Merge branch 'v4-devel' into v5-devel
Conflicts:
ChangeLog
runtime/parser.c
tests/Makefile.am
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions