diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-06 17:32:29 +0200 |
| commit | 40e70777ea9e9d72b87a387ca3fe67ce45c3e00f (patch) | |
| tree | 88687f796b0efd4c2c61aaca4feb5977933f9f14 /template.c | |
| parent | e4c926bfbca3aab3fe34fc9cfedb7343423de016 (diff) | |
| parent | 80ff634c841d692c1d9f335b88e225d6ce7317f7 (diff) | |
| download | rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.gz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.tar.xz rsyslog-40e70777ea9e9d72b87a387ca3fe67ce45c3e00f.zip | |
Merge branch 'v4-devel'
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/rsyslog_conf_modules.html
runtime/rsyslog.h
tests/Makefile.am
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions