[mapserver-commits] r11685 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-05-12 11:14:00 -0700 (Thu, 12 May 2011)
New Revision: 11685

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapserver.h
Log:
SVN trunk is now 6.1-dev, future 6.2

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-12 18:08:53 UTC (rev 11684)
+++ trunk/mapserver/HISTORY.TXT	2011-05-12 18:14:00 UTC (rev 11685)
@@ -12,6 +12,11 @@
 
 For a complete change history, please see the Subversion log comments.
 
+Current Version (SVN trunk, 6.1-dev, future 6.2): 
+------------------------------------------------- 
+
+- ...
+
 Version 6.0.0 (2011-05-11)
 --------------------------
 

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2011-05-12 18:08:53 UTC (rev 11684)
+++ trunk/mapserver/mapserver.h	2011-05-12 18:14:00 UTC (rev 11685)
@@ -32,10 +32,10 @@
 /*
 ** MapServer version - to be updated for every release 
 */
-#define MS_VERSION "6.0.0"
+#define MS_VERSION "6.1-dev"
 
 #define MS_VERSION_MAJOR    6
-#define MS_VERSION_MINOR    0
+#define MS_VERSION_MINOR    1
 #define MS_VERSION_REV      0
 
 #define MS_VERSION_NUM (MS_VERSION_MAJOR*10000+MS_VERSION_MINOR*100+MS_VERSION_REV)