* Huge merge with original branch

--HG--
branch : trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 580e237712f..4c6a37794f6 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -324,7 +324,7 @@ class ObjectMgr
         typedef std::vector<std::string> ScriptNameMap;
 
 		UNORDERED_MAP<uint32, uint32> TransportEventMap;
-        
+
 		Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
         Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); }
 
@@ -538,7 +538,7 @@ class ObjectMgr
         void LoadEventScripts();
         void LoadSpellScripts();
 		void LoadWaypointScripts();
-		
+
 		void LoadTransportEvents();
 
         bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value);
@@ -616,7 +616,7 @@ class ObjectMgr
         uint32 GeneratePetNumber();
         uint32 GenerateArenaTeamId();
         uint32 GenerateGuildId();
-        
+
         void LoadPlayerInfoInCache();
         PCachePlayerInfo GetPlayerInfoFromCache(uint32 unPlayerGuid) const;
         CachePlayerInfoMap m_mPlayerInfoMap;