Merge 0.9.19
authornemo
Fri, 31 May 2013 14:51:08 -0400
changeset 9094 2cdb0ed3813a
parent 9088 553355472675 (diff)
parent 9093 4114ce5d885d (current diff)
child 9098 cba0d2199123
Merge 0.9.19
CMakeLists.txt
QTfrontend/main.cpp
cmake_modules/CPackConfig.cmake
--- a/CMakeLists.txt	Fri May 31 14:47:07 2013 -0400
+++ b/CMakeLists.txt	Fri May 31 14:51:08 2013 -0400
@@ -84,7 +84,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 19)
-set(HEDGEWARS_PROTO_VER 45)
+set(HEDGEWARS_PROTO_VER 44)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 message(STATUS "Building ${HEDGEWARS_VERSION}-r${HEDGEWARS_REVISION} (${HEDGEWARS_HASH})")
--- a/QTfrontend/main.cpp	Fri May 31 14:47:07 2013 -0400
+++ b/QTfrontend/main.cpp	Fri May 31 14:51:08 2013 -0400
@@ -222,12 +222,12 @@
         }
         else // couldn't retrieve documents folder? almost impossible, but in case fall back to classic path
         {
-            checkForDir(cfgdir->absolutePath() + "/.hedgewars_0.9.19");
-            cfgdir->cd(".hedgewars_0.9.19");
+            checkForDir(cfgdir->absolutePath() + "/.hedgewars");
+            cfgdir->cd(".hedgewars");
         }
 #else
-        checkForDir(cfgdir->absolutePath() + "/.hedgewars_0.9.19");
-        cfgdir->cd(".hedgewars_0.9.19");
+        checkForDir(cfgdir->absolutePath() + "/.hedgewars");
+        cfgdir->cd(".hedgewars");
 #endif
     }