Kandera 7b8a707721 Merge branch 'master' into wintergrasp_cleanup ...

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/CMakeLists.txt
	src/server/shared/Logging/Log.h

2012-08-06 12:26:29 -04:00

..

base

Core/Player: Fix issues with 'ignore this slot' option on equipment manager usage

2012-07-13 16:27:11 +02: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

SQL: Proper directory and file ending for sql

2012-07-16 21:35:38 +01:00

updates

Merge branch 'master' into wintergrasp_cleanup

2012-08-06 12:26:29 -04:00