Commit Graph
2 Commits
Author SHA1 Message Date
Spp d35d33aa86 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/Kalimdor/CMakeLists.txt
2013-01-03 09:17:53 +01:00
Malcrom 38c55a15ad Core/Scripting: Rename zone scripts. 2013-01-02 14:52:13 -03:30