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
65ae868cc813adc7e2d319c017ed61e87257fb40
TrinityCore/sql
History
Vincent-Michael 65ae868cc8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-04-28 23:00:41 +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-04-28 23:00:41 +02:00