Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1f62d9c3875c446e3b8a23f8624c3ee8d8eb80cc
TrinityCore/sql
History
Vincent-Michael 1f62d9c387 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ItemHandler.cpp
	src/server/scripts/Spells/spell_dk.cpp
2014-06-07 23:40:37 +02:00
..
base
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-28 23:00:41 +02:00
create
…
old
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-05 20:43:05 +02:00
updates
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-06-07 23:40:37 +02:00