Files
TrinityCore/sql/updates
Machiavelli fe69bd654a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
2011-12-06 12:01:51 +01:00
..