Spp 0e8011657d Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h

2013-01-16 15:29:41 +01:00

..

authserver

Core/Logging: Use correct realmId when logging to DB

2013-01-16 08:59:56 +01:00

collision

Core/Misc: Apply codestyle to multiple files

2013-01-14 09:50:59 +01:00

game

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

scripts

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

shared

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

worldserver

Merge branch 'master' into 4.3.4

2013-01-16 15:29:41 +01:00

CMakeLists.txt

Update copyright note for 2013.

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