summaryrefslogtreecommitdiffstats
path: root/tests/cfg2.testin
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-01-26 12:03:50 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-01-26 12:03:50 +0100
commit62e00d7a1c1d0301d50e7a28cb84563d61410ecd (patch)
treec7496b89e62eabe3fb376c0b1c9ea8f015f0afec /tests/cfg2.testin
parentad58b9c8fbc6159a361d40d97decddb95758c0a7 (diff)
parent939852b1cdfaed376342a3a0aa4b0fb7c14f55c5 (diff)
downloadrsyslog-62e00d7a1c1d0301d50e7a28cb84563d61410ecd.tar.gz
rsyslog-62e00d7a1c1d0301d50e7a28cb84563d61410ecd.tar.xz
rsyslog-62e00d7a1c1d0301d50e7a28cb84563d61410ecd.zip
Merge branch 'v4-beta' into tmp
Conflicts: ChangeLog
Diffstat (limited to 'tests/cfg2.testin')
0 files changed, 0 insertions, 0 deletions