# HG changeset patch
# User nemo
# Date 1387928363 18000
# Node ID c14c5e2f9d6949313a16454c41d7b1e2a80b7631
# Parent  4dc7cb571e1ddb14850439eb5f2d121b0ce0b602# Parent  2b8f928faa1470858190cd9724b9ceed2a887358
merge w/ 0.9.20

diff -r 2b8f928faa14 -r c14c5e2f9d69 CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 24 18:38:27 2013 -0500
+++ b/CMakeLists.txt	Tue Dec 24 18:39:23 2013 -0500
@@ -43,7 +43,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 20)
-set(HEDGEWARS_PROTO_VER 47)
+set(HEDGEWARS_PROTO_VER 46)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 include(${CMAKE_MODULE_PATH}/revinfo.cmake)