merge with tip 0.9.19 0.9.19-release
authorunc0rr
Fri, 31 May 2013 00:12:11 +0400
branch0.9.19
changeset 9089 1617149e01a4
parent 9086 77f471657230 (diff)
parent 9088 553355472675 (current diff)
child 9090 9ceacd996ea0
merge with tip
--- a/CMakeLists.txt	Thu May 30 21:08:13 2013 +0900
+++ b/CMakeLists.txt	Fri May 31 00:12:11 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 44)
+set(HEDGEWARS_PROTO_VER 45)
 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/gameServer/CoreTypes.hs	Thu May 30 21:08:13 2013 +0900
+++ b/gameServer/CoreTypes.hs	Fri May 31 00:12:11 2013 +0400
@@ -238,8 +238,8 @@
     ServerInfo
         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.18 is out! Please update.</h3><p align=center><a href=http://hedgewars.org/download.html>Download page here</a></font>"
-        43 -- latestReleaseVersion
+        "<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
         41 -- earliestCompatibleVersion
         46631
         ""
--- a/gameServer/Utils.hs	Thu May 30 21:08:13 2013 +0900
+++ b/gameServer/Utils.hs	Fri May 31 00:12:11 2013 +0400
@@ -90,6 +90,8 @@
             , (42, "0.9.18-dev")
             , (43, "0.9.18")
             , (44, "0.9.19-dev")
+            , (45, "0.9.19")
+            , (46, "0.9.20-dev")
             ]
 
 askFromConsole :: B.ByteString -> IO B.ByteString