# HG changeset patch
# User nemo
# Date 1370026268 14400
# Node ID 2cdb0ed3813a1b30d8ae6fd0bf029b13de7089f9
# Parent  5533554726753f841b493266bba25ecc2522e064# Parent  4114ce5d885db270c456c2a0de46abc0789bb18b
Merge 0.9.19

diff -r 4114ce5d885d -r 2cdb0ed3813a CMakeLists.txt
--- 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})")
diff -r 4114ce5d885d -r 2cdb0ed3813a QTfrontend/main.cpp
--- 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
     }