aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-09-21 12:12:47 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-09-21 12:12:47 +0200
commitd29556ef89a9f63b8c77d98643bf210ebfeedcad (patch)
treedfbd82b137fd65c734870b774dcc305060c570aa
parent5061def42242ed424cfc96166095762811dc1c5f (diff)
parentef70382d5bf32732c064134bcc0aa31a8f3c8055 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
-rw-r--r--sql/updates/world/2014_09_21_00_world_spell_dbc_335.sql (renamed from sql/updates/world/2014_09_21_00_world_spell_dbc.sql)0
-rw-r--r--sql/updates/world/2014_09_21_01_world_spell_dbc_335.sql (renamed from sql/updates/world/2014_09_21_01_world_spell_dbc.sql)0
2 files changed, 0 insertions, 0 deletions
diff --git a/sql/updates/world/2014_09_21_00_world_spell_dbc.sql b/sql/updates/world/2014_09_21_00_world_spell_dbc_335.sql
index d762bf92107..d762bf92107 100644
--- a/sql/updates/world/2014_09_21_00_world_spell_dbc.sql
+++ b/sql/updates/world/2014_09_21_00_world_spell_dbc_335.sql
diff --git a/sql/updates/world/2014_09_21_01_world_spell_dbc.sql b/sql/updates/world/2014_09_21_01_world_spell_dbc_335.sql
index 55b02edfc59..55b02edfc59 100644
--- a/sql/updates/world/2014_09_21_01_world_spell_dbc.sql
+++ b/sql/updates/world/2014_09_21_01_world_spell_dbc_335.sql