[mapserver-commits] r11622 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2011-04-27 12:25:21 -0700 (Wed, 27 Apr 2011)
New Revision: 11622

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapserver.h
Log:
Update for 6.0.0-rc1

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-04-27 18:17:33 UTC (rev 11621)
+++ trunk/mapserver/HISTORY.TXT	2011-04-27 19:25:21 UTC (rev 11622)
@@ -12,14 +12,15 @@
 
 For a complete change history, please see the Subversion log comments.
 
-Current Version (SVN trunk): 
----------------------------- 
+Version 6.0.0-rc1 (2011-04-27)
+------------------------------
 
 - Fix for the styleitem handling with union layer (#3674)
 
-- Fixed mindsitance label test to check layer indexes. (#3851)
+- Fixed mindistance label test to check layer indexes. (#3851)
 
-- Fixed segmentation fault in PHP/MapScript and improved the php object method calls (#3730)
+- Fixed segmentation fault in PHP/MapScript and improved the php object
+  method calls (#3730)
 
 - Fix build issue related to unnecessary use of gdal-config --dep-libs (#3316)
 

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2011-04-27 18:17:33 UTC (rev 11621)
+++ trunk/mapserver/mapserver.h	2011-04-27 19:25:21 UTC (rev 11622)
@@ -32,7 +32,7 @@
 /*
 ** MapServer version - to be updated for every release 
 */
-#define MS_VERSION "6.0.0-beta7"
+#define MS_VERSION "6.0.0-rc1"
 
 #define MS_VERSION_MAJOR    6
 #define MS_VERSION_MINOR    0