# HG changeset patch
# User koda
# Date 1388450029 -3600
# Node ID 1c02143bfe9cfad74817cbb59ba8dcf262226ab9
# Parent  6e09ca662fa32a5d2c6365d7f45819d8f9e62f46# Parent  af0520a6bf0061b27f8321514d35fcd2b1ef5f9c
merge from .20 again

diff -r af0520a6bf00 -r 1c02143bfe9c cmake_modules/cpackvars.cmake
--- a/cmake_modules/cpackvars.cmake	Tue Dec 31 00:32:55 2013 +0100
+++ b/cmake_modules/cpackvars.cmake	Tue Dec 31 01:33:49 2013 +0100
@@ -89,6 +89,8 @@
 #    "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/cmdlineClient"
     "^${CMAKE_CURRENT_SOURCE_DIR}/misc/winutils/bin"
     "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/promotional_art"
+    "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/AudioMono"
+    "^${CMAKE_CURRENT_SOURCE_DIR}/project_files/HedgewarsMobile"
     "^${CMAKE_CURRENT_SOURCE_DIR}/tools/templates"
     "^${CMAKE_CURRENT_SOURCE_DIR}/tools/drawMapTest"
     "^${CMAKE_CURRENT_SOURCE_DIR}/doc"
diff -r af0520a6bf00 -r 1c02143bfe9c gameServer/CoreTypes.hs
--- a/gameServer/CoreTypes.hs	Tue Dec 31 00:32:55 2013 +0100
+++ b/gameServer/CoreTypes.hs	Tue Dec 31 01:33:49 2013 +0100
@@ -253,7 +253,7 @@
         True
         "<h2><p align=center><a href=\"http://www.hedgewars.org/\">http://www.hedgewars.org/</a></p></h2>"
         "<font color=yellow><h3 align=center>Hedgewars 0.9.19 is out! Please update.</h3><p align=center><a href=http://hedgewars.org/download.html>Download page here</a></font>"
-        45 -- latestReleaseVersion
+        47 -- latestReleaseVersion
         41 -- earliestCompatibleVersion
         46631
         ""
diff -r af0520a6bf00 -r 1c02143bfe9c gameServer/OfficialServer/extdbinterface.hs
--- a/gameServer/OfficialServer/extdbinterface.hs	Tue Dec 31 00:32:55 2013 +0100
+++ b/gameServer/OfficialServer/extdbinterface.hs	Tue Dec 31 01:33:49 2013 +0100
@@ -11,6 +11,7 @@
 import Database.HDBC.MySQL
 import Data.List (lookup)
 import qualified Data.ByteString.Char8 as B
+import Data.Word
 --------------------------
 import CoreTypes
 import Utils
@@ -91,7 +92,7 @@
         , SqlInt32 (readInt_ value)
         , SqlByteString fileName
         , SqlByteString location
-        , SqlInt32 p
+        , SqlInt32 $ fromIntegral p
         ] : ps bs
     ps (b:bs) = ps bs