diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:48:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:48:33 +0200 |
| commit | ad296ff1be9045bfa2da7a1ab304f31f2366bc6b (patch) | |
| tree | a6a3e6d7226a9b93f52aba50f6413c02b17470ca /tests/testsuites/imfile-basic.conf | |
| parent | 88fdb0c5ef6a34d28b358c9a50a6b172e25c4ee4 (diff) | |
| parent | a9933094b20d70da1641d80bb723e2570b937c36 (diff) | |
| download | rsyslog-ad296ff1be9045bfa2da7a1ab304f31f2366bc6b.tar.gz rsyslog-ad296ff1be9045bfa2da7a1ab304f31f2366bc6b.tar.xz rsyslog-ad296ff1be9045bfa2da7a1ab304f31f2366bc6b.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'tests/testsuites/imfile-basic.conf')
0 files changed, 0 insertions, 0 deletions