[Greater-commits] r3668 - in branches/3.0.0-all-models/GREAT-ER: . Greater

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 16:26:15 +0200 (Mon, 25 Jul 2011)
New Revision: 3668

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/version.py
Log:
Merged revisions 410 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

But change the version to include the date and name this version 2.9.5-full
to signal that this ia a release leading up to 3 and full because it includes
all models

........
  r410 | bricks | 2011-07-12 15:18:50 +0200 (Tue, 12 Jul 2011) | 2 lines
  
  Update greater version to 3.0.0-beta
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403
   + /trunk/GREAT-ER:1-232,310,312-315,319,322,327,333,335,340-344,346-347,368,375,397-398,400,403,410

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:19:26 UTC (rev 3667)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 14:26:15 UTC (rev 3668)
@@ -37,6 +37,7 @@
 	* Greater/Modules/results.py:
 		- Fix typo
 		- Check if a binary object has a file_obj before accessing it
+	* Greater/version.py: Changed to 2.9.5-full
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/version.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/version.py	2011-07-25 14:19:26 UTC (rev 3667)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/version.py	2011-07-25 14:26:15 UTC (rev 3668)
@@ -16,10 +16,10 @@
 # $Id: version.py,v 1.6 2006-05-10 15:07:27 frank Exp $
 
 
-version = 'cvs'
+#version = 'svn'
+#append_date = 1
+version = '2.9.5-full'
 append_date = 1
-#version = '2.1.0'
-#append_date = 0
 
 import os, os.path
 import time