Nay 4ee7558aa2 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/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-22 15:05:45 +01:00

..

genrev

Update headers for 2012. HAPPY NEW YEAR!!!

2012-01-01 00:32:13 +01:00

server

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

2012-08-22 15:05:45 +01:00

tools

Tools: Use correct flags in mkdir

2012-08-21 22:23:45 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

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