Merge remote-tracking branch 'origin/master' into develop

5 years ago · 61a1915cce
parent 03db48af75 417a07c22d
commit 61a1915cce
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -51,6 +51,7 @@ doxygen/
 .browse.VC.db*
 *.stackdump
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/tasks.json