Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source

Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp

...

This commit is contained in:

Vincent-Michael committed 2013-07-28 18:41:57 +02:00

2 parents 9c5c43381b 62918e92d0

commit 0710f480b7

15 files changed

+401 -40

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/old/3.3.5a/TDB49_to_TDB50_updates/world/2012_12_18_00_characters_worldstates.sql → sql/old/3.3.5a/TDB49_to_TDB50_updates/characters/2012_12_18_00_characters_worldstates.sql

File renamed without changes.

sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_01_27_00_auth_realmlist.sql → sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_01_27_00_auth_realmlist.sql

File renamed without changes.

sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_00_auth_misc.sql → sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_00_auth_misc.sql

File renamed without changes.

sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_04_01_auth_account.sql → sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_04_01_auth_account.sql

File renamed without changes.

sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_05_00_auth_account.sql → sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_05_00_auth_account.sql

File renamed without changes.

sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_07_00_auth_account.sql → sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_07_00_auth_account.sql

File renamed without changes.

sql/old/3.3.5a/TDB50_to_TDB51_updates/world/2013_02_08_00_auth_account.sql → sql/old/3.3.5a/TDB50_to_TDB51_updates/auth/2013_02_08_00_auth_account.sql

File renamed without changes.