Merge branch 'miami' into lcs

Browse Source

# Conflicts:
#	premake5.lua
#	src/audio/AudioLogic.cpp
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp

...

This commit is contained in:

Sergeanur

2021-08-19 11:47:03 +03:00

parent c707f92d0a 71e0895dc6

commit 136b25133d

20 changed files with 944 additions and 422 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

650

src/audio/AudioLogic.cpp

File diff suppressed because it is too large Load Diff