Files
TrinityCore/sql/updates/world
Vincent_Michael b2d05c9cdd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
2013-02-28 22:14:48 +01:00
..