Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
49a17c6282fac3d2636e3db740b1a6960fb387ba
TrinityCore/sql
History
Vincent-Michael 49a17c6282 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
2014-05-22 20:53:13 +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-05-22 20:53:13 +02:00