Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
fe69bd654a424f560f37774d5c3e763fd6589607
TrinityCore/sql/updates
History
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
..
characters
Core/Misc: Fix compile and char creation
2011-11-26 01:46:41 +01:00
world
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2011-12-06 12:01:51 +01:00