summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-12-04 12:11:58 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-12-04 12:11:58 +0100
commit2dd15ac57327603307c0ae2f5f96fd1392d6f897 (patch)
treeed15becd6ebc0d6ce3e5ee5d38d7dc211ce5785e /NEWS
parent56f338f1b4f5f6c428f7aa3fa3f82a13e63e49e7 (diff)
parentd74b4fef35e8a2c3a58fe66720840ae2ee77a02d (diff)
downloadrsyslog-2dd15ac57327603307c0ae2f5f96fd1392d6f897.tar.gz
rsyslog-2dd15ac57327603307c0ae2f5f96fd1392d6f897.tar.xz
rsyslog-2dd15ac57327603307c0ae2f5f96fd1392d6f897.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions