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

..

authserver

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

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

scripts

Merge pull request #7543 from gigatotem/4.3.4

2012-08-27 15:17:54 -07:00

shared

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

2012-08-27 14:11:57 +01:00

worldserver

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

2012-08-27 22:43:07 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

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