diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-20 18:51:25 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-20 18:51:25 +0100 |
| commit | 4e3589857a2b2667d4b9ad92fe152acb85283aca (patch) | |
| tree | 43ccbfb0a52f090ee5b1af589da008d3c333d5ed /syslog-tst.conf | |
| parent | 7d20954653fa0f8999822554dcb048ee60dbbe58 (diff) | |
| parent | 5b55ab75e27861241981ae447ed3d1b8ad968deb (diff) | |
| download | rsyslog-4e3589857a2b2667d4b9ad92fe152acb85283aca.tar.gz rsyslog-4e3589857a2b2667d4b9ad92fe152acb85283aca.tar.xz rsyslog-4e3589857a2b2667d4b9ad92fe152acb85283aca.zip | |
Merge branch 'v4-devel' into tmp
Conflicts:
ChangeLog
tests/Makefile.am
tests/sndrcv_drvr.sh
tools/syslogd.c
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions