Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan

This commit is contained in:
Lynix
2016-10-28 18:46:51 +02:00
187 changed files with 5446 additions and 2068 deletions

3
.gitignore vendored
View File

@@ -4,6 +4,9 @@ build/config.lua
# Nazara libraries
lib/*
# Nazara plugin libraries
plugins/lib/*
# Nazara package
package/*