araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-16 13:09:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
fe69bd654a424f560f37774d5c3e763fd6589607
TrinityCore/src/server
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
..
authserver
Merge branch 'master' into 4.x
2011-11-26 03:19:37 +00:00
collision
Fix vmapassembler
2011-12-01 04:19:38 +03:30
game
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2011-12-06 12:01:51 +01:00
scripts
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2011-12-06 12:01:51 +01:00
shared
Cosmetic changes and typo fixes
2011-11-27 17:46:05 +01:00
worldserver
DB/Player: Add class/race level stats for the new combos (level 1 only);
2011-11-27 01:29:21 +00:00
CMakeLists.txt
Core/Buildsystem: Update copyright-headers for 2011, and adjust with the correct teamname as well.
2011-04-27 18:17:00 +02:00