*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) 2008-2009 Trinity <http://www.trinitycore.org/>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -269,7 +269,7 @@ bool OutdoorPvPTF::SetupOutdoorPvP()

    m_IsLocked = false;
    m_LockTimer = TF_LOCK_TIME;
-    m_LockTimerUpdate = 0; 
+    m_LockTimerUpdate = 0;
    hours_left = 6;
    second_digit = 0;
    first_digit = 0;