diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:38:35 -0700 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:38:35 -0700 |
| commit | 93662146b46c03b2a5db83ae074aa77f207dd98a (patch) | |
| tree | 32db6d8cca9c8c06b110c41ce1e33ccf1193e565 /template.h | |
| parent | f60fd65378d4bfc110e8ae1b55197d73c3293f0c (diff) | |
| parent | 87472f58b4cd47762a7b134f0d8521cabc739cae (diff) | |
| download | rsyslog-93662146b46c03b2a5db83ae074aa77f207dd98a.tar.gz rsyslog-93662146b46c03b2a5db83ae074aa77f207dd98a.tar.xz rsyslog-93662146b46c03b2a5db83ae074aa77f207dd98a.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
Diffstat (limited to 'template.h')
0 files changed, 0 insertions, 0 deletions