# HG changeset patch # User unc0rr # Date 1369944731 -14400 # Node ID 1617149e01a4fa25637e2ab655d0287ef9c21b7c # Parent 77f471657230b44dea833080835e2e92e477feef# Parent 5533554726753f841b493266bba25ecc2522e064 merge with tip diff -r 553355472675 -r 1617149e01a4 CMakeLists.txt --- 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})") diff -r 553355472675 -r 1617149e01a4 gameServer/CoreTypes.hs --- 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 "
" - "