Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Browse Source

Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)

...

This commit is contained in:

Rémi Verschelde

2017-01-02 21:38:20 +01:00

parent db46a34418 2820b2d82b

commit 3f3f5a5359

287 changed files with 59481 additions and 17904 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

5125

servers/visual/shader_language.cpp

File diff suppressed because it is too large Load Diff