diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-27 10:45:45 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-27 10:45:45 +0100 |
commit | 306ba17b54bd89843ad083f23e11fde43758f928 (patch) | |
tree | feeeb111983360f51c58c5fb6650f938ecb7de86 /tests/testsuites/tabescape_off.conf | |
parent | f77dc853ed217e824d86bf8feb0c6e75cc0f230e (diff) | |
parent | 26893eb8edfa38fb06c61379919a817dadf01615 (diff) | |
download | rsyslog-306ba17b54bd89843ad083f23e11fde43758f928.tar.gz rsyslog-306ba17b54bd89843ad083f23e11fde43758f928.tar.xz rsyslog-306ba17b54bd89843ad083f23e11fde43758f928.zip |
Merge branch 'v4-devel' into master
I needed to (temporarily) remove the $EscapeControlCharacterTab config
directive as it no longer fits into the rewritten rsyslog parser part.
Conflicts:
dirty.h
tools/syslogd.c
Diffstat (limited to 'tests/testsuites/tabescape_off.conf')
0 files changed, 0 insertions, 0 deletions