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

Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h

2014-04-28 23:00:41 +02:00

41 KiB

Raw Blame History

View Raw