summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-11-18 12:05:51 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-11-18 12:05:51 +0100
commit599133164d93afb0dab792dadb8f5d6bc3d68a3f (patch)
tree9a8f791fa21386d3620fb8297e14e1c5eb231a62 /COPYING
parenta5417f16044d7d56dbceeea09e25ba3e8c47cc01 (diff)
parent49dcad849e93551d90cd6298a576b67c4ad0c7ef (diff)
downloadrsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.tar.gz
rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.tar.xz
rsyslog-599133164d93afb0dab792dadb8f5d6bc3d68a3f.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html doc/property_replacer.html
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions