Vincent-Michael da91ae1f22 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp

2014-09-27 05:23:46 +02:00

..

base

SQL: Sync world_database after tdb 335.56 release

2014-09-21 17:09:51 +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

TDB 434.08 - 2014/09/21

2014-09-21 13:47:57 +02:00

updates/world

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-09-27 05:23:46 +02:00