svn commit: r14708 - trunk: src/argouml-app www

Author: linus
Date: 2008-05-11 16:00:12-0700
New Revision: 14708

Modified:
   trunk/src/argouml-app/default.properties
   trunk/www/release_plan.html

Log:
The next release will be either the 0.25.6 or the 0.26.alpha1 release.
Until decided it will compile as 0.25.6.

Modified: trunk/src/argouml-app/default.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/default.properties?view=diff&rev=14708&p1=trunk/src/argouml-app/default.properties&p2=trunk/src/argouml-app/default.properties&r1=14707&r2=14708
==============================================================================
--- trunk/src/argouml-app/default.properties	(original)
+++ trunk/src/argouml-app/default.properties	2008-05-11 16:00:12-0700
@@ -11,7 +11,7 @@
 #
 # Argo version
 #
-argo.core.version=PRE-0.25.5
+argo.core.version=PRE-0.25.6
 #
 # Compilation properties
 #

Modified: trunk/www/release_plan.html
Url: http://argouml.tigris.org/source/browse/argouml/trunk/www/release_plan.html?view=diff&rev=14708&p1=trunk/www/release_plan.html&p2=trunk/www/release_plan.html&r1=14707&r2=14708
==============================================================================
--- trunk/www/release_plan.html	(original)
+++ trunk/www/release_plan.html	2008-05-11 16:00:12-0700
@@ -31,45 +31,45 @@
 
 <h3>ArgoUML release 0.25.5</h3>
 <p>
-Planned date: 2008-05-01
+Date: 2008-05-11
 </p>
 <ul>
 <li>All P1 issues (especially 4946) must be solved.
 <li>New directory names.
 </ul>
 
-<h3>ArgoUML release 0.26.alpha1</h3>
+<h3>ArgoUML release 0.26.alpha1 or 0.25.6</h3>
 <p>
-Planned date: 2008-05-13
+Planned date: 2008-05-20
 </p>
 
 <h3>ArgoUML release 0.26.alpha2</h3>
 <p>
-Planned date: 2008-05-20
+Planned date: 2008-05-26
+</p>
+
+<h3>GSoC Students starts coding</h3>
+<p>
+Planned date: 2008-05-26
 </p>
 
 <h3>ArgoUML release 0.26.beta1</h3>
 <p>
-Planned date: 2008-05-25
+Planned date: 2008-06-01
 </p>
 <ul>
 <li>All P1 and P2 issues must be solved.
 </ul>
 
-<h3>GSoC Students starts coding</h3>
-<p>
-Planned date: 2008-05-26
-</p>
-
 <h3>ArgoUML release 0.26.beta2</h3>
 If necessary!
 <p>
-Planned date: 2008-05-30
+Planned date: 2008-06-07
 </p>
 
 <h3>ArgoUML release 0.26</h3>
 <p>
-Planned date: 2008-06-05
+Planned date: 2008-06-14
 </p>