summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_conf.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-30 11:25:34 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-30 11:25:34 +0200
commit1531c541b294b6c029e5de9a01d4d8499f7e4718 (patch)
treee2522f8b38478c7482d0d2db4c7610a3c5816cb5 /doc/rsyslog_conf.html
parent16970aad2e6d4e69fb9fdb13b392ba6a51dea900 (diff)
parentd03fb1b9058a3e81c8d0ba72b916d514106567ed (diff)
downloadrsyslog-1531c541b294b6c029e5de9a01d4d8499f7e4718.tar.gz
rsyslog-1531c541b294b6c029e5de9a01d4d8499f7e4718.tar.xz
rsyslog-1531c541b294b6c029e5de9a01d4d8499f7e4718.zip
Merge branch 'master' into perf
Conflicts: ChangeLog
Diffstat (limited to 'doc/rsyslog_conf.html')
0 files changed, 0 insertions, 0 deletions