summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-25 20:46:54 +0000
committerQMK Bot <hello@qmk.fm>2021-04-25 20:46:54 +0000
commit61a1915cce620cfa732389d0601ff30e34962e60 (patch)
treeda59ad5ee28995328d3affb8f9d0651788e0ae83
parent03db48af750a29b2548b2132ae5df66f4be7c5e0 (diff)
parent417a07c22db39dc544f00f9a8b71a7fe1479981e (diff)
downloadqmk_firmware-61a1915cce620cfa732389d0601ff30e34962e60.tar.gz
qmk_firmware-61a1915cce620cfa732389d0601ff30e34962e60.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 518b2df83a..3592abcea3 100644
--- 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