Merge branch 'develop' into testing_uwp

2018-01-19 11:41:51 +01:00
parent f818ec0e05 5931bd501c
commit 750323da53
181 changed files with 55170 additions and 12456 deletions
@@ -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