Merge branch 'master' into miami

Browse Source

# Conflicts:
#	premake5.lua
#	sdk/rwsdk/include/d3d8/baaplylt.c
#	sdk/rwsdk/include/d3d8/rpstereo.h
#	sdk/rwsdk/include/d3d8/rpstereo.rpe
#	sdk/rwsdk/include/d3d8/rtintel.h
#	sdk/rwsdk/include/d3d8/rtintel.rpe
#	src/audio/oal/stream.cpp

...

This commit is contained in:

Sergeanur

2020-08-02 19:49:12 +03:00

parent bda383c9cd a786dd45a4

commit 3e24ae8812

325 changed files with 1699 additions and 16 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

1338

sdk/rwsdk/include/d3d8/rtimport.h Normal file

File diff suppressed because it is too large Load Diff