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

# Conflicts: # .gitignore
2021-06-20 21:14:16 +01:00
parent b78b0e040a 9986bb877c
commit d269bb2d29
3 changed files with 5 additions and 14 deletions
--- a/src/.vscode/launch.json
+++ b/src/.vscode/launch.json
@ -1,12 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Debug",
-            "type": "gdb",
-            "request": "launch",
-            "target": "./bin/executable",
-            "cwd": "${workspaceRoot}"
-        }
-    ]
-}