Spp a227a34947 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/AI/CoreAI/PetAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp

2012-12-17 12:13:51 +01:00

..

base

Merge branch 'master' into 4.3.4

2012-12-07 09:22:43 +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

Merge branch 'master' into 4.3.4

2012-11-19 10:09:58 +01:00

updates

Merge branch 'master' into 4.3.4

2012-12-17 12:13:51 +01:00