Merge remote-tracking branch 'origin/master' into miami

Browse Source

# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h

...

This commit is contained in:

Sergeanur

2020-05-26 17:24:47 +03:00

parent 0cd883e2a1 c83b351887

commit 0ce2af7a0d

13 changed files with 715 additions and 774 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1268

src/audio/AudioLogic.cpp

File diff suppressed because it is too large Load Diff