Files
TrinityCore/src/server/scripts/EasternKingdoms
Intel 4825832c85 Merge branch '6.x' into Spells
Conflicts:
	src/server/game/DataStores/DBCStores.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/scripts/Spells/spell_druid.cpp
2014-12-07 23:20:52 +02:00
..