Merge branch upstream/master while introducing compile errors and reverting parts of Android changes, video BPP options are gone

Browse Source

...

This commit is contained in:

Sergii Pylypenko

2021-11-29 02:17:14 +02:00

parent 47b01a0528 39662aabef

commit 2f6b20cbfd

667 changed files with 66564 additions and 29169 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

2270

src/settings.cpp

File diff suppressed because it is too large Load Diff