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

..

genrev

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

server

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

tools

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

CMakeLists.txt

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00