update master for version 6.3-dev

MapServer · Jul 2, 2012 · c5d56fa · c5d56fa
1 parent 77f1511
commit c5d56fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -11,7 +11,13 @@ the top of the list.)
 
 For a complete change history, please see the Git log comments.
 
-Current Version (git master, 6.1-dev, future 6.2): 
+Current Version (git master, 6.1-dev, future 6.2):
+-------------------------------------------------
+
+- Add notable changes here. Less important changes should go only in the
+  commit message and not appear here.
+
+Version 6.2 (beta1: 20120629): 
 -------------------------------------------------
 
 - Fix WFS filter is produced as non-standard XML (#4171)

diff --git a/mapserver.h b/mapserver.h
@@ -32,10 +32,10 @@
 /*
 ** MapServer version - to be updated for every release
 */
-#define MS_VERSION "6.1-dev"
+#define MS_VERSION "6.3-dev"
 
 #define MS_VERSION_MAJOR    6
-#define MS_VERSION_MINOR    1
+#define MS_VERSION_MINOR    3
 #define MS_VERSION_REV      0
 
 #define MS_VERSION_NUM (MS_VERSION_MAJOR*10000+MS_VERSION_MINOR*100+MS_VERSION_REV)