diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-30 12:11:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-30 12:11:09 +0100 |
| commit | d1ccc0302653017782a59c3ff9e5f7e69811173e (patch) | |
| tree | 0b2de603f6a8182c73fab29d1d0c63e24b29197b /template.c | |
| parent | 786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e (diff) | |
| parent | 1aac36dfd077073a76b80368f893810e1741a1ec (diff) | |
| download | rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.tar.gz rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.tar.xz rsyslog-d1ccc0302653017782a59c3ff9e5f7e69811173e.zip | |
Merge branch 'v5-devel'v6.1.1
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions