diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 18:04:01 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-10 18:04:01 +0100 |
| commit | d0a83a1f7a762010971a9f909a1e28a83fa7cf2c (patch) | |
| tree | 3bb6451baa10296b0cd40fbf25cc2a16238358ee /syslog-tst.conf | |
| parent | 9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9 (diff) | |
| parent | 545a80918b9a0cc75e12de4a9c718dc875a5276a (diff) | |
| download | rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.gz rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.xz rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.zip | |
Merge branch 'v4-stable-tmp' into v5-devel-tmp
Conflicts:
dirty.h
tools/syslogd.c
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions