# HG changeset patch
# User nemo
# Date 1351713295 14400
# Node ID 3b44ecf91928b496fe78349d2b6653b4e882c940
# Parent  ba735701ce7fa5c50c582aa773e2f3210bb00417# Parent  aea103d58d834b59c6abbf3b936acf7ac8e88ae0
merge trunk w/ final 0.9.18

diff -r aea103d58d83 -r 3b44ecf91928 CMakeLists.txt
--- a/CMakeLists.txt	Wed Oct 31 15:31:18 2012 -0400
+++ b/CMakeLists.txt	Wed Oct 31 15:54:55 2012 -0400
@@ -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}")