summaryrefslogtreecommitdiffstats
path: root/syslog-tst.conf
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-02 12:19:44 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-02 12:19:44 +0200
commite92a0db46dfd2661a92e41a678d982ce6d3eedde (patch)
tree4e09eb39484f497e8eab28bf85bb933e139df49d /syslog-tst.conf
parent8a819d6a0623c0854462dd2dc632700f9a5c576c (diff)
parente4f012eb60f6531f964557ba9eac54048ae2bef8 (diff)
downloadrsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.gz
rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.tar.xz
rsyslog-e92a0db46dfd2661a92e41a678d982ce6d3eedde.zip
Merge branch 'master' into oracle
Conflicts: Makefile.am
Diffstat (limited to 'syslog-tst.conf')
0 files changed, 0 insertions, 0 deletions