Merge branch 'master' into vulkan

This commit is contained in:
Lynix
2017-07-04 22:41:29 +02:00
839 changed files with 12369 additions and 5421 deletions

5
.gitignore vendored
View File

@@ -15,12 +15,14 @@ examples/bin/*.exe
examples/bin/*.pdb
examples/bin/*.dll
examples/bin/*.so
examples/bin/Demo*
# Unit tests
tests/*.exe
tests/*.pdb
tests/*.dll
tests/*.so
tests/NazaraUnitTests*
# Example generated files
examples/bin/HardwareInfo.txt
@@ -49,6 +51,7 @@ build/**/*.project
# GMake
build/**/*.make
build/**/*.d
# Visual Studio
build/**/*.pdb
@@ -60,7 +63,7 @@ build/**/*.vcxprojResolveAssemblyReference.cache
build/**/*.nativecodeanalysis.all.xml
build/**/*.nativecodeanalysis.xml
build/**/*.VC.opendb
build/**/*.VC.db
build/**/*.VC.db*
# Compiled Object files
build/**/*.slo