diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 12:39:59 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 12:39:59 +0100 |
| commit | 68c13f3f6a691c7f854e6fa4caff43295896dbde (patch) | |
| tree | c131d2b276384339f189f29738d0a64136e15265 /template.c | |
| parent | d3da845a61129c256c3e96fe144ea1dd67bac7c6 (diff) | |
| parent | cc8237736d11b54a3d6089d836da7ccb6972a29c (diff) | |
| download | rsyslog-68c13f3f6a691c7f854e6fa4caff43295896dbde.tar.gz rsyslog-68c13f3f6a691c7f854e6fa4caff43295896dbde.tar.xz rsyslog-68c13f3f6a691c7f854e6fa4caff43295896dbde.zip | |
Merge branch 'v4-devel' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/imfile.html
doc/manual.html
plugins/imudp/imudp.c
runtime/msg.h
tools/syslogd.c
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions