Merge branch 'master' into merge_upstream

This commit is contained in:
Bart Moyaers
2020-01-15 13:24:59 +01:00
370 changed files with 496645 additions and 22916 deletions

12
.gitignore vendored
View File

@@ -22,4 +22,14 @@ pip-selfcheck.json
# Virtualenv
.venv/*
.gitignore
.gitignore
# CMake
CMakeFiles/
CMakeCache.txt
cmake_install.cmake
CTestTestFile.cmake
# Visual Studio build files
*.vcxproj
*.vcxproj.filters
*.sln