# HG changeset patch
# User unc0rr
# Date 1419962403 -10800
# Node ID d58d7d8b53927728a09f2011f6707c25eb773f05
# Parent  37264e44ec0fb84c7056af567972724cdeada115# Parent  2cfa650836218a0d02713458465f8905397968bf
Merge fixes from .21 branch

diff -r 2cfa65083621 -r d58d7d8b5392 CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 30 19:07:57 2014 +0300
+++ b/CMakeLists.txt	Tue Dec 30 21:00:03 2014 +0300
@@ -52,7 +52,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 21)
-set(HEDGEWARS_PROTO_VER 49)
+set(HEDGEWARS_PROTO_VER 48)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 include(${CMAKE_MODULE_PATH}/revinfo.cmake)
 
diff -r 2cfa65083621 -r d58d7d8b5392 hedgewars/uGearsHandlersRope.pas
--- a/hedgewars/uGearsHandlersRope.pas	Tue Dec 30 19:07:57 2014 +0300
+++ b/hedgewars/uGearsHandlersRope.pas	Tue Dec 30 21:00:03 2014 +0300
@@ -29,7 +29,7 @@
     uAmmos, uDebug, uUtils, uGearsHedgehog, uGearsRender;
 
 const
-    IsNilHHFatal = true;
+    IsNilHHFatal = false;
 
 procedure doStepRopeAfterAttack(Gear: PGear);
 var
diff -r 2cfa65083621 -r d58d7d8b5392 share/hedgewars/Data/Graphics/amRubber.png
Binary file share/hedgewars/Data/Graphics/amRubber.png has changed