Nay 9c26ce8da5 Merge branch 'master' into 4.x ...

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h

2012-01-07 17:13:42 +00:00

..

2011_11_25_00_characters_character_stats.sql

Core/Mechanics:

2011-11-25 15:28:36 +01:00

2011_11_25_01_characters_characters.sql

Core/Mechanics:

2011-11-25 15:28:36 +01:00

2011_11_25_02_characters_character_pet.sql

Core/Mechanics:

2011-11-25 15:28:36 +01:00

2011_11_25_03_characters_character_stats.sql

Core/Misc:

2011-11-25 18:54:59 +01:00

2011_11_25_03_characters_characters.sql

Core/Misc:

2011-11-25 18:54:59 +01:00

2011_11_25_03_characters_corpse.sql

Core/Misc:

2011-11-25 18:54:59 +01:00

2011_11_26_00_characters_characters.sql

Core/Misc: Fix compile and char creation

2011-11-26 01:46:41 +01:00

2012_01_04_00_characters_character_queststatus_seasonal.sql

SQL: Correct SQL naming/locations for recent pull

2012-01-04 23:13:31 +02:00