* Huge merge with original branch

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp
index 8bcdd0f54a0..d39c2c68071 100644
--- a/src/game/TargetedMovementGenerator.cpp
+++ b/src/game/TargetedMovementGenerator.cpp
@@ -59,7 +59,7 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
     float x, y, z;
     if(!i_offset)
     {
-        // to nearest random contact position 
+        // to nearest random contact position
         i_target->GetRandomContactPoint( &owner, x, y, z, 0, MELEE_RANGE - 0.5f );
     }
     else
@@ -101,7 +101,7 @@ TargetedMovementGenerator<T>::Initialize(T &owner)
 
     if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->canFly())
         owner.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2);
-    
+
     _setTargetLocation(owner);
 }