Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
7d37629c17286ceef31e0746da50c73cade7a958
TrinityCore/src/server/shared/Packets
History
Spp 709129f222 Merge branch 'master' into 4.3.4 (+ some changes to minimize differences) 
Conflicts:
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/Formulas.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Waypoints/WaypointManager.cpp
	src/server/game/Skills/SkillDiscovery.cpp
	src/server/game/Skills/SkillExtraItems.cpp
	src/server/game/Warden/WardenCheckMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
2013-01-30 11:57:02 +01:00
..
ByteBuffer.h
Merge branch 'master' into 4.3.4 (+ some changes to minimize differences)
2013-01-30 11:57:02 +01:00