summaryrefslogtreecommitdiffstats
path: root/template.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-23 13:29:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-23 13:29:22 +0200
commitc4b93886d01e5ee454b009862ff8dd603dbb28b1 (patch)
tree256829f8977ca4dd0d82832d1183712f710fa372 /template.h
parent4ee092935b56c24ceb53488be04175482638b686 (diff)
parent75d8becf10cf83c984590ce9ba666d86b382e7e6 (diff)
downloadrsyslog-c4b93886d01e5ee454b009862ff8dd603dbb28b1.tar.gz
rsyslog-c4b93886d01e5ee454b009862ff8dd603dbb28b1.tar.xz
rsyslog-c4b93886d01e5ee454b009862ff8dd603dbb28b1.zip
Merge branch 'beta'
Conflicts: doc/troubleshoot.html
Diffstat (limited to 'template.h')
0 files changed, 0 insertions, 0 deletions