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

Conflicts:
	src/server/authserver/Authentication/AuthCodes.cpp
	src/server/authserver/Authentication/AuthCodes.h
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp

2012-08-28 14:11:04 +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-28 14:11:04 +01:00

tools

Core: Fix a typo and whitespace cleanup

2012-08-22 22:56:31 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

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