# HG changeset patch
# User nemo
# Date 1532797092 14400
# Node ID 470982c05f7e171d78c529852c83aa836fb22e91
# Parent  8f9b84d6991d798b3ba78265eda9baf805802fa4# Parent  730e7837d9dfd333cde659d69a7cde44a8f91b91
merge of 0.9.24 - hopefully correctly this time

diff -r 8f9b84d6991d -r 470982c05f7e ChangeLog.txt
diff -r 8f9b84d6991d -r 470982c05f7e QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt	Sat Jul 28 13:15:59 2018 +0200
+++ b/QTfrontend/CMakeLists.txt	Sat Jul 28 12:58:12 2018 -0400
@@ -94,7 +94,7 @@
     campaign.cpp
     ui_hwform.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/hwconsts.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/sdlkeys.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sdlkeys.cpp
     )
 
 if(MINGW)
diff -r 8f9b84d6991d -r 470982c05f7e README.md
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/SDLh.pas
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/uConsts.pas
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/uGearsHedgehog.pas
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/uGearsUtils.pas
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/uInputHandler.pas
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/uStore.pas
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/uVariables.pas
diff -r 8f9b84d6991d -r 470982c05f7e hedgewars/uVisualGearsList.pas
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_ar.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_bg.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_cs.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_da.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_de.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_el.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_en.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_es.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_fi.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_fr.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_gd.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_gl.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_hu.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_it.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_ja.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_ko.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_lt.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_ms.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_nl.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_pl.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_pt_BR.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_pt_PT.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_ro.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_ru.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_sk.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_sv.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_tr_TR.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_uk.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_zh_CN.ts
diff -r 8f9b84d6991d -r 470982c05f7e share/hedgewars/Data/Locale/hedgewars_zh_TW.ts