# HG changeset patch
# User nemo
# Date 1293485535 18000
# Node ID edf7d04d3fa97de48feec80bee99cdb3911f9827
# Parent  038cd49777a7c5437d3ddf9b339c099376341ab4# Parent  3d808af10ea07c9ecffe1c7b749d9600ed8d01dd
merge 0.9.15 (with a typo fix)

diff -r 038cd49777a7 -r edf7d04d3fa9 CMakeLists.txt
diff -r 038cd49777a7 -r edf7d04d3fa9 ChangeLog.txt
diff -r 038cd49777a7 -r edf7d04d3fa9 hedgewars/uLandPainted.pas
--- a/hedgewars/uLandPainted.pas	Mon Dec 27 19:49:40 2010 +0100
+++ b/hedgewars/uLandPainted.pas	Mon Dec 27 16:32:15 2010 -0500
@@ -149,12 +149,12 @@
         begin
         if (pe^.point.flags and $80 <> 0) then
             begin
-            AddFileLog('[DRAW] Move to: ('+inttostr(pe^.point.X)+','+inttostr(pe^.point.Y)+')');
+            {$IFDEF DEBUGFILE}AddFileLog('[DRAW] Move to: ('+inttostr(pe^.point.X)+','+inttostr(pe^.point.Y)+')');{$ENDIF}
             FillRoundInLand(pe^.point.X, pe^.point.Y, 34, lfBasic)
             end
             else
             begin
-            AddFileLog('[DRAW] Line to: ('+inttostr(pe^.point.X)+','+inttostr(pe^.point.Y)+')');
+            {$IFDEF DEBUGFILE}AddFileLog('[DRAW] Line to: ('+inttostr(pe^.point.X)+','+inttostr(pe^.point.Y)+')');{$ENDIF}
             DrawLineOnLand(prevPoint.X, prevPoint.Y, pe^.point.X, pe^.point.Y);
             end;