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

Browse Source

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt

...

This commit is contained in:

Vincent_Michael committed 2013-02-18 18:51:52 +01:00

2 parents 2277f6db44 1c745dfe16

commit 71eaceae5d

74 files changed

+1107 -570

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/09521_character_achievement.sql → sql/old/3.3.5a/09521_characters_character_achievement.sql

File renamed without changes.

sql/old/3.3.5a/2011_04_14_00_characters.sql → sql/old/3.3.5a/2011_04_14_00_characters_misc.sql

File renamed without changes.

sql/old/3.3.5a/2011_04_19_00_characters.sql → sql/old/3.3.5a/2011_04_19_00_characters_misc.sql

File renamed without changes.

sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql → sql/old/3.3.5a/2012_04_20_05_world_gameobject_template.sql

File renamed without changes.

sql/old/3.3.5a/2012_07_01_01_achievement_criteria_data.sql → sql/old/3.3.5a/2012_07_01_01_world_achievement_criteria_data.sql

File renamed without changes.

sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql → sql/old/3.3.5a/2012_10_09_00_characters_glyphs.sql

File renamed without changes.

sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql → sql/old/3.3.5a/2012_10_17_00_characters_gm_tickets.sql

File renamed without changes.

sql/old/3.3.5a/2012_11_02_00_character_misc.sql → sql/old/3.3.5a/2012_11_02_00_characters_misc.sql

File renamed without changes.

sql/old/3.3.5a/2012_11_18_00_character_calendar.sql → sql/old/3.3.5a/2012_11_18_00_characters_calendar.sql

File renamed without changes.

sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql → sql/old/3.3.5a/2012_12_03_00_characters_character_queststatus_monthly.sql

File renamed without changes.

sql/old/3.3.5a/2012_12_13_00_world.sql → sql/old/3.3.5a/2012_12_13_00_world_misc.sql

File renamed without changes.

sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql → sql/old/3.3.5a/2012_12_18_00_characters_worldstates.sql

File renamed without changes.

sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql → sql/old/3.3.5a/2013_01_01_00_world_item_template_restore.sql

File renamed without changes.

sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql → sql/old/3.3.5a/2013_01_02_05_world_eye_of_eternity.sql

File renamed without changes.