Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
0e8011657d08c4a9f12657ccbe2f73aa56effaaa
TrinityCore/sql
History
Spp 0e8011657d Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16 15:29:41 +01:00
..
base
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-12-23 08:33:13 -05:00
create
Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.
2010-12-24 18:33:11 +01:00
old
Merge branch 'master' into 4.3.4
2013-01-14 11:04:03 +01:00
updates
Merge branch 'master' into 4.3.4
2013-01-16 15:29:41 +01:00