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

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

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

..

genrev

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

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

server

Merge branch 'master' into 4.x

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

tools

Core: cleanup.

2011-09-01 22:38:32 +03: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