josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8bc519a308ab78b1d6b243f49b332ddd9dd4ae17
TCPlayerbotCore/src
T
History
Vincent-Michael 8bc519a308 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2014-07-23 06:32:44 +02:00
..
genrev
Update copyright note for 2014.
2014-01-01 00:07:53 +01:00
server
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-07-23 06:32:44 +02:00
tools
Merge branch 'master' into 4.3.4
2014-07-22 13:15:36 +01:00
CMakeLists.txt
Update copyright note for 2014.
2014-01-01 00:07:53 +01:00