Merge branch 'develop' into testing_uwp

This commit is contained in:
Ray 2018-01-19 11:41:51 +01:00 • committed by GitHub
commit 750323da53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
181 changed files with 55151 additions and 12437 deletions

8
.gitignore vendored
View file

@ -115,9 +115,6 @@ docs/examples/web/*/*.html
!docs/examples/web/shaders/loader.html
!docs/examples/web/models/loader.html
# Meson build system
builddir/
# CMake stuff
CMakeCache.txt
CMakeFiles
@ -137,3 +134,8 @@ build
# Ignore Android generated files and folders
templates/android_project/output
# Ignore GNU global tags
GPATH
GRTAGS
GTAGS