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

Former-commit-id: 7d8b0c7ab7d9dd9b2da8c6e0f6061d5314437686 [formerly 26c96fcff07aa0b1c0a3b95f18be3c29e03c9d88] Former-commit-id: 04d8b83c2bb7719a83bcda40be25752fa4c7dd81
2016-06-12 23:00:33 +02:00
parent c45cb6bb12 6eca751ee5
commit 8e9deee43e
185 changed files with 8172 additions and 850 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ examples/bin/*.dll
 examples/bin/*.so
 tests/*.exe
 tests/*.pdb
+tests/*.dll
+tests/*.so
 lib/*

 # Feature page