# HG changeset patch
# User nemo
# Date 1314886383 14400
# Node ID 87eec4c9a889a5dcb2df6fe77723229c7ab9cc24
# Parent  3b7f2bfc86322b672639ecefc21de6dfa9153e24# Parent  a962d0823f49548ff72b2d50d03efea9ee3c81ee
merge

diff -r a962d0823f49 -r 87eec4c9a889 QTfrontend/res/btnBottomBorder.png
Binary file QTfrontend/res/btnBottomBorder.png has changed
diff -r a962d0823f49 -r 87eec4c9a889 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Thu Sep 01 00:28:38 2011 +0200
+++ b/hedgewars/GSHandlers.inc	Thu Sep 01 10:13:03 2011 -0400
@@ -1227,7 +1227,7 @@
 
     if abs(LongInt(HHGear^.Angle) - BTPrevAngle) > 7  then
         begin
-        Gear^.dX := SignAs(AngleSin(HHGear^.Angle) * _0_5, HHGear^.dX);
+        Gear^.dX := SignAs(AngleSin(HHGear^.Angle) * _0_5, Gear^.dX);
         Gear^.dY := AngleCos(HHGear^.Angle) * ( - _0_5);
         BTPrevAngle := HHGear^.Angle;
         b := true
diff -r a962d0823f49 -r 87eec4c9a889 share/hedgewars/Data/Themes/EarthRise/horizontL.png
Binary file share/hedgewars/Data/Themes/EarthRise/horizontL.png has changed