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

Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/scripts/EasternKingdoms/hinterlands.cpp

2012-11-22 15:04:59 +01:00

..

authserver

Merge branch 'master' into 4.3.4

2012-11-09 14:26:27 +01:00

collision

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

game

Merge branch 'master' into 4.3.4

2012-11-22 15:04:59 +01:00

scripts

Merge branch 'master' into 4.3.4

2012-11-22 15:04:59 +01:00

shared

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

worldserver

Core/Currency: Add support of Conquest points cap for arena and bg

2012-11-21 18:25:23 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

2012-01-07 23:10:50 +01:00