araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-24 15:40:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
c97c381ea0b63963b3756f531b8c64636cb5d66b
TrinityCore/sql
T
History
Spp c97c381ea0 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/shared/Packets/ByteBuffer.h
2013-03-25 14:34:22 +01:00
..
base
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-03-10 01:08:55 +01: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' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-02-18 18:51:52 +01:00
updates
Merge branch 'master' into 4.3.4
2013-03-25 14:34:22 +01:00