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

..

base

Core/Player: fixed player loading to reflect new DB changes

2011-11-27 09:37:32 +01:00

create

Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.

2010-12-24 18:33:11 +01:00

old

DB: TDB 43: Move SQL updates to the old directory

2011-11-23 22:31:44 +00:00

updates

Merge branch 'master' into 4.x

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