Sergeanur c53b23cff0 Merge remote-tracking branch 'origin/master' into miami ...

# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h

2020-05-20 14:39:36 +03:00

27 KiB

Raw Blame History

View Raw