Merge pull request tpaviot#159 from tpaviot/tp/rc1

tpaviot · tpaviot · commit 991672df419e · 2013-09-04T08:31:01.000-07:00
0.6-rc1
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+CHANGES FROM 0.6-beta to 0.6-rc1
+==================================================================
+- wxPython/OpenGl fix on Windows
+
 ==================================================================
 CHANGES FROM 0.6-alpha2 to 0.6-beta
 - massive examples clean-up and fixes
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,7 @@ PROJECT(${PROJECT_NAME})
 SET(${PROJECT_NAME}_VERSION_MAJOR 0)
 SET(${PROJECT_NAME}_VERSION_MINOR 6)
 #  Empty for official releases, set to -dev, -rc1, etc for development releases
-SET(${PROJECT_NAME}_VERSION_DEVEL -alpha)
+SET(${PROJECT_NAME}_VERSION_DEVEL -rc1)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
diff --git a/src/wrapper/environment.py b/src/wrapper/environment.py
@@ -31,7 +31,7 @@
 # VARIABLES
 #===============================================================================
 
-VERSION = '0.6-beta'         # Define pythonOCC version
+VERSION = '0.6-rc1'         # Define pythonOCC version
 GEOM_RELEASE = 'geom-6.3.1.8' # located in /src/contrib/
 SMESH_RELEASE = 'smesh-5.1.2.2' # located in /src/contrib
 #===============================================================================
