summaryrefslogtreecommitdiffstats
path: root/runtime/conf.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-30 18:56:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-30 18:56:43 +0200
commit5ecc00336c2b7da02cd38f0f0cbc337ee628d59e (patch)
tree2b685603016f834beb8847dc93d38334979dc13c /runtime/conf.h
parentaaffc4281e0b26f419a3fc341461f2fc479080b8 (diff)
parenta0496e7bd4cba22d2559adb50cd286f75cc6a40e (diff)
downloadrsyslog-5ecc00336c2b7da02cd38f0f0cbc337ee628d59e.tar.gz
rsyslog-5ecc00336c2b7da02cd38f0f0cbc337ee628d59e.tar.xz
rsyslog-5ecc00336c2b7da02cd38f0f0cbc337ee628d59e.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'runtime/conf.h')
0 files changed, 0 insertions, 0 deletions