Nay e3ea3b28bd Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/worldserver/worldserver.conf.dist

2012-08-21 23:40:38 +01:00

..

authserver

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-08-21 23:40:38 +01:00

collision

Core/Misc: Some fixes here and there

2012-08-20 11:05:50 +02:00

game

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-08-21 23:40:38 +01:00

scripts

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-08-21 23:40:38 +01:00

shared

Core/Loading: Fixed a crash at char login

2012-08-18 18:51:59 -05:00

worldserver

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-08-21 23:40:38 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

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