Kandera 277aed85cf Merge branch 'master' into wintergrasp_cleanup ...

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/World/World.h
	src/server/shared/Logging/Log.h

2012-02-21 11:00:32 -05:00

..

base

Core/Warden: Base implementation for Warden functionality

2012-02-19 13:51:16 +01:00

create

Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.

2010-12-24 18:33:11 +01:00

old

TDB 335.11.46 - 2012/02/13

2012-02-12 23:50:16 +00:00

updates

Merge branch 'master' into wintergrasp_cleanup

2012-02-21 11:00:32 -05:00