Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
e295937e54
1 changed files with 1 additions and 0 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -64,6 +64,7 @@ build/
|
||||||
cmake-build-debug
|
cmake-build-debug
|
||||||
CMakeLists.txt
|
CMakeLists.txt
|
||||||
*.pdf
|
*.pdf
|
||||||
|
*.zip
|
||||||
|
|
||||||
# Let these ones be user specific, since we have so many different configurations
|
# Let these ones be user specific, since we have so many different configurations
|
||||||
*.code-workspace
|
*.code-workspace
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue