Nay 846870bf6c Merge branch 'master' into 4.x ...

Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp

2011-11-26 03:19:37 +00:00

..

authserver

Merge branch 'master' into 4.x

2011-11-26 03:19:37 +00:00

collision

Core: Fixed a few warnings and silly typos in scripts

2011-11-23 16:57:08 +01:00

game

Merge branch 'master' into 4.x

2011-11-26 03:19:37 +00:00

scripts

Merge branch 'master' into 4.x

2011-11-26 03:19:37 +00:00

shared

Core/Misc: Fix compile and char creation

2011-11-26 01:46:41 +01:00

worldserver

Core/Enums: Add two new races to enumerations and update maxlevel in config

2011-11-24 00:35:11 +00:00

CMakeLists.txt

Core/Buildsystem: Update copyright-headers for 2011, and adjust with the correct teamname as well.

2011-04-27 18:17:00 +02:00