araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 06:29:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
339574e2fdcd654280cd06a38466cab44eab5133
TrinityCore/sql/updates
T
History
DDuarte cdb33ab174 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
2014-07-24 17:10:21 +01:00
..
auth
Core/Battleground:
2014-07-09 16:43:56 +02:00
world
Merge branch 'master' into 4.3.4
2014-07-24 17:10:21 +01:00