diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
commit | b6f496f8619b02c50d3f5ced34eff279244b6e9b (patch) | |
tree | d534a1941848a4f9577076cd11330f3ee014033c /doc/status.html | |
parent | a27e249e445deecb1d9ef57fbbb203d71bf061dd (diff) | |
parent | 162c9e91e970cc9475bc86ffd00fd1d939e1e487 (diff) | |
download | rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.gz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.xz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.zip |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'doc/status.html')
-rw-r--r-- | doc/status.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/status.html b/doc/status.html index ec3fbb48..211a17bc 100644 --- a/doc/status.html +++ b/doc/status.html @@ -9,12 +9,12 @@ <a href="http://www.rsyslog.com/Article279.phtml">change log</a> - <a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-132.phtml">download</a> -<br><b>beta:</b> 3.19.11 [2008-08-25] - -<a href="http://www.rsyslog.com/Article273.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-129.phtml">download</a></p> +<br><b>beta:</b> 3.19.12 [2008-10-16] - +<a href="http://www.rsyslog.com/Article283.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-134.phtml">download</a></p> -<p><b>v3 stable:</b> 3.18.4 [2008-09-18] - <a href="http://www.rsyslog.com/Article277.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-131.phtml">download</a> +<p><b>v3 stable:</b> 3.18.5 [2008-10-09] - <a href="http://www.rsyslog.com/Article281.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-133.phtml">download</a> <br><b>v2 stable:</b> 2.0.6 [2008-08-07] - <a href="http://www.rsyslog.com/Article266.phtml">change log</a> - <a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-125.phtml">download</a> |