Merge remote-tracking branch 'upstream/master' into speedup-gpu

Browse Source

...

This commit is contained in:

gellert

2016-08-02 14:59:03 +02:00

parent 4088f0eb33 217156f76c

commit 8eed91d87a

79 changed files with 674 additions and 436 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

2

vendor/native_mate vendored

Submodule vendor/native_mate updated: d9bfe6a49d...fa483e1fe0