diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-28 18:41:57 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-28 18:41:57 +0200 |
| commit | 0710f480b7e26f235d65ce6ab4c547788cd70ac9 (patch) | |
| tree | aa5fcf02f92c00e66693d319fafca980c7f9b4a2 /sql/old | |
| parent | 9c5c43381bed3aec22307a8a96f7984ab96e7eac (diff) | |
| parent | 62918e92d0493978e16f5fb1365818e9efa8461b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_paladin.cpp
Diffstat (limited to 'sql/old')
| -rw-r--r-- | sql/old/3.3.5a/TDB49_to_TDB50_updates/characters/2012_12_18_00_characters_worldstates.sql (renamed from sql/old/3.3.5a/TDB49_to_TDB50_updates/world/2012_12_18_00_characters_worldstates.sql) | 0 | ||||
| -rw-r--r-- | sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_01_27_00_auth_realmlist.sql (renamed from sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_01_27_00_auth_realmlist.sql) | 0 | ||||
| -rw-r--r-- | sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_00_auth_misc.sql (renamed from sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_00_auth_misc.sql) | 0 | ||||
| -rw-r--r-- | sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_01_auth_account.sql (renamed from sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_01_auth_account.sql) | 0 | ||||
| -rw-r--r-- | sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_05_00_auth_account.sql (renamed from sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_05_00_auth_account.sql) | 0 | ||||
| -rw-r--r-- | sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_07_00_auth_account.sql (renamed from sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_07_00_auth_account.sql) | 0 | ||||
| -rw-r--r-- | sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_08_00_auth_account.sql (renamed from sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_08_00_auth_account.sql) | 0 |
7 files changed, 0 insertions, 0 deletions
diff --git a/sql/old/3.3.5a/TDB49_to_TDB50_updates/world/2012_12_18_00_characters_worldstates.sql b/sql/old/3.3.5a/TDB49_to_TDB50_updates/characters/2012_12_18_00_characters_worldstates.sql index c6fc15e60b7..c6fc15e60b7 100644 --- a/sql/old/3.3.5a/TDB49_to_TDB50_updates/world/2012_12_18_00_characters_worldstates.sql +++ b/sql/old/3.3.5a/TDB49_to_TDB50_updates/characters/2012_12_18_00_characters_worldstates.sql diff --git a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_01_27_00_auth_realmlist.sql b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_01_27_00_auth_realmlist.sql index 0c3b18448e6..0c3b18448e6 100644 --- a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_01_27_00_auth_realmlist.sql +++ b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_01_27_00_auth_realmlist.sql diff --git a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_00_auth_misc.sql b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_00_auth_misc.sql index d8a508e4e7b..d8a508e4e7b 100644 --- a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_00_auth_misc.sql +++ b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_00_auth_misc.sql diff --git a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_01_auth_account.sql b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_01_auth_account.sql index 9af73d41ee3..9af73d41ee3 100644 --- a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_01_auth_account.sql +++ b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_01_auth_account.sql diff --git a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_05_00_auth_account.sql b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_05_00_auth_account.sql index 2f32c5e3e3e..2f32c5e3e3e 100644 --- a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_05_00_auth_account.sql +++ b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_05_00_auth_account.sql diff --git a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_07_00_auth_account.sql b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_07_00_auth_account.sql index 03bdf8cdcd5..03bdf8cdcd5 100644 --- a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_07_00_auth_account.sql +++ b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_07_00_auth_account.sql diff --git a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_08_00_auth_account.sql b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_08_00_auth_account.sql index 49948781444..49948781444 100644 --- a/sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_08_00_auth_account.sql +++ b/sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_08_00_auth_account.sql |