summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_conf_global.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-29 17:41:28 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-29 17:41:28 +0200
commitd9f1bbf46e0e240dc8bdbaf6db74e499e668faa2 (patch)
tree3950a942de498562f7e5446d806746ed25501e1b /doc/rsyslog_conf_global.html
parenteafafc63597a600fceda5ac9ada90acd6e2f037e (diff)
parent3e2be47ed69d2b4ce21777a75ad6128592e84d1d (diff)
downloadrsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.tar.gz
rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.tar.xz
rsyslog-d9f1bbf46e0e240dc8bdbaf6db74e499e668faa2.zip
Merge branch 'beta'
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'doc/rsyslog_conf_global.html')
0 files changed, 0 insertions, 0 deletions