*Merge.

--HG-- branch : trunk
2009-02-04 17:22:43 -06:00
parent 5d4d953055 c745eba4a1
commit d69198732e
373 changed files with 2607 additions and 2215 deletions
@@ -1,4 +1,4 @@
-/* 
+/*
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 *
 * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -50,7 +50,7 @@ inline uint32 getMSTime()
 inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime)
 {
    // getMSTime() have limited data range and this is case when it overflow in this tick
-    if (oldMSTime > newMSTime)                    
+    if (oldMSTime > newMSTime)
        return (0xFFFFFFFF - oldMSTime) + newMSTime;
    else
        return newMSTime - oldMSTime;