diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-17 20:24:29 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-17 20:24:29 +0200 |
| commit | 63675c3b0b960a35d02513b323916cd7a0a55236 (patch) | |
| tree | 0fc88bf1ed462a0883c2f37edd7faa2064fca503 /src/server/scripts/EasternKingdoms | |
| parent | b95b19b3cb21f0b51481c71b77ac58bf7268b2c4 (diff) | |
| parent | 4ba3c2e51df0485449a4bd01f162faa719334be9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/Spells/spell_generic.cpp
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_ironforge.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp index fb5758fa5cf..3886f08159f 100644 --- a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -16,16 +15,6 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Ironforge -SD%Complete: 0 -SDComment: -SDCategory: Ironforge -EndScriptData */ - -/* ContentData -EndContentData */ - #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" |