Merge branch 'master' into single-file-transcoder

Browse Source

...

This commit is contained in:

Carl Woffenden

2020-03-20 19:40:30 +01:00

parent 0cc6736a3e fc92177a50

commit 3953f6099a

58 changed files with 20970 additions and 6900 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

transcoder/basisu_transcoder.cpp

+6960 -1183

File diff suppressed because it is too large Load Diff