araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-18 14:10:18 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
9391d087fd1707ae9298e0f6ced54bf3d7f11c13
TrinityCore/sql
T
History
Vincent_Michael 9391d087fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-15 23:33:36 +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' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-01-15 23:33:36 +01:00