diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 11:58:20 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 11:58:20 +0200 |
| commit | 0c7604dc27119122a3022c7bf094ffb5f8d59e6d (patch) | |
| tree | 370ad5d009cb301e5ea4757f8ac34a7179d28448 /runtime/conf.c | |
| parent | b1e21fcb4b072b1780ce093e890450fe3a059de8 (diff) | |
| parent | b26387e6b28630b8e5e3582039141ebf1c7455e3 (diff) | |
| download | rsyslog-0c7604dc27119122a3022c7bf094ffb5f8d59e6d.tar.gz rsyslog-0c7604dc27119122a3022c7bf094ffb5f8d59e6d.tar.bz2 rsyslog-0c7604dc27119122a3022c7bf094ffb5f8d59e6d.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
tools/omfile.c
tools/ompipe.c
Diffstat (limited to 'runtime/conf.c')
0 files changed, 0 insertions, 0 deletions