summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2021-06-29 12:23:03 -0700
committerDrashna Jael're <drashna@live.com>2021-06-29 12:24:07 -0700
commitacf2c323e2927f6007b17ded577cf49fd86fec6c (patch)
tree8334dc5c71e6ab9bf33c76143eac7bb0e60159b0 /.gitignore
parentec7a7beeed3046e9144d4c4ce0ef3b2c4f9e4341 (diff)
parentf55e39e8a2246f6f96fd5d4a84a866e2615cde7b (diff)
Merge upstream QMK Firmware at '0.12.52~1'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d9f3c30d3d..ec04818547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
*.swp
tags
*~
+api_data/v1
build/
.build/
*.bak
@@ -44,18 +45,20 @@ 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
.vscode/last.sql
.vscode/temp.sql
+.vscode/ipch/
.stfolder
.tags
# ignore image files
*.png
-*.jpg
*.gif
+*.jpg
# things travis sees
secrets.tar
@@ -64,6 +67,7 @@ id_rsa_*
# python things
__pycache__
+.python-version
# prerequisites for updating ChibiOS
/util/fmpp*