Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
cc85d1b5b75fc522b94783c99e212346429bfe4a
TrinityCore/sql
History
Vincent_Michael cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
2014-01-13 20:34:21 +01:00
..
base
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-01-13 20:34:21 +01:00
create
…
old
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-09 20:02:21 +02:00
updates
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-01-13 20:34:21 +01:00