Nay d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp

2012-08-30 23:06:19 +01:00

..

base

SQL: Add missing changes to character_base.sql

2012-08-23 18:49:43 +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: Move all world sql updates to /old/ directory. Base DB is available in https://github.com/TrinityCore/TrinityCore_4.3.4_DB_Alpha

2012-08-16 00:07:29 +01:00

updates

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

2012-08-30 23:06:19 +01:00