merge from stable
authorkoda
Tue, 30 Oct 2012 00:17:23 +0100
changeset 7892 617553fe0196
parent 7889 57b117d441b9 (diff)
parent 7891 77faa4b96771 (current diff)
child 7894 1e8e9400e9de
merge from stable
CMakeLists.txt
--- a/CMakeLists.txt	Tue Oct 30 00:13:22 2012 +0100
+++ b/CMakeLists.txt	Tue Oct 30 00:17:23 2012 +0100
@@ -12,7 +12,7 @@
 
 
 #detect Mercurial revision (if present)
-set(version_suffix "") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
 set(HGCHANGED "")
 IF(version_suffix MATCHES "-dev")
     set(HW_DEV true)
@@ -43,8 +43,8 @@
 #versioning
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
-set(CPACK_PACKAGE_VERSION_PATCH 18${version_suffix})
-set(HEDGEWARS_PROTO_VER 43)
+set(CPACK_PACKAGE_VERSION_PATCH 19${version_suffix})
+set(HEDGEWARS_PROTO_VER 44)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")