Files
TrinityCore/src/server/game/Spells
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
..
2011-11-25 15:28:36 +01:00
2011-11-07 11:18:00 -06:00