* Huge merge with original branch

--HG--
branch : trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp
index 72d7ab1c3eb..c64b653d5e9 100644
--- a/src/game/FleeingMovementGenerator.cpp
+++ b/src/game/FleeingMovementGenerator.cpp
@@ -53,14 +53,14 @@ template<>
 bool FleeingMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
 {
     if(i_destinationHolder.HasArrived())
-        return false; 
-    
-    i_destinationHolder.GetDestination(x, y, z); 
+        return false;
+
+    i_destinationHolder.GetDestination(x, y, z);
     return true;
 }
 
 template<>
-bool FleeingMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const 
+bool FleeingMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const
 {
 	return false;
 }