Merge remote-tracking branch 'qmk/master' into vial

This commit is contained in:
Ilya Zhuravlev
2021-06-26 16:11:57 -04:00
4671 changed files with 157521 additions and 33976 deletions

3
.gitignore vendored
View File

@@ -6,6 +6,7 @@
*.eep
*.elf
*.hex
*.uf2
*.qmk
!util/bootloader.hex
!quantum/tools/eeprom_reset.hex
@@ -51,6 +52,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
@@ -72,6 +74,7 @@ id_rsa_*
# python things
__pycache__
.python-version
# prerequisites for updating ChibiOS
/util/fmpp*