josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
aa6ae2773f439ec5b41509e591f723163ca2bb0b
TCPlayerbotCore/src
T
History
Vincent-Michael aa6ae2773f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
2014-04-19 22:49:25 +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-04-19 22:49:25 +02:00
tools
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-19 19:57:46 +02:00
CMakeLists.txt
Update copyright note for 2014.
2014-01-01 00:07:53 +01:00