Merge branch 'master' into vulkan

This commit is contained in:
Lynix
2016-11-21 00:32:57 +01:00
140 changed files with 4261 additions and 1744 deletions

4
.gitignore vendored
View File

@@ -35,6 +35,7 @@ build/scripts/features/index.html
doc
# Codeblocks
*.save-failed
build/**/*.cbp
build/**/*.cbp
build/**/*.cbTemp
@@ -46,6 +47,9 @@ build/**/*.workspace
# CodeLite
build/**/*.project
# GMake
build/**/*.make
# Visual Studio
build/**/*.pdb
build/**/*.filters