Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
7540cfedfc74b2c5e91ded052182fd3b02ca7b66
TrinityCore/sql/updates
History
Vincent_Michael 66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
2013-01-11 19:10:10 +01:00
..
characters
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-23 08:34:10 -05:00
world
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-01-11 19:10:10 +01:00