Merge upstream QMK Firmware at '0.12.52~1'

This commit is contained in:
Drashna Jael're
2021-06-29 12:23:03 -07:00
415 changed files with 18692 additions and 7301 deletions

6
.gitignore vendored
View File

@@ -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*