Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
e295937e54
1
.gitignore
vendored
1
.gitignore
vendored
@ -64,6 +64,7 @@ build/
|
||||
cmake-build-debug
|
||||
CMakeLists.txt
|
||||
*.pdf
|
||||
*.zip
|
||||
|
||||
# Let these ones be user specific, since we have so many different configurations
|
||||
*.code-workspace
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user