mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-04 17:05:17 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
ef34560e11
4
.gitignore
vendored
4
.gitignore
vendored
@ -5,6 +5,10 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
._*
|
._*
|
||||||
|
|
||||||
|
# Merge files
|
||||||
|
*.orig
|
||||||
|
*.rej
|
||||||
|
|
||||||
# Build artifacts
|
# Build artifacts
|
||||||
.clang_complete
|
.clang_complete
|
||||||
.build/
|
.build/
|
||||||
|
Loading…
Reference in New Issue
Block a user