~ruther/qmk_firmware

9fa14655df114c9da8c720f8364fd9dd4e963d19 — QMK Bot 3 years ago 580bcff + 847cca5 
Merge remote-tracking branch 'origin/master' into develop
patch browse .tar.gz 
1 files changed, 4 insertions(+), 0 deletions(-)

M .gitignore

M .gitignore => .gitignore +4 -0
@@ 5,6 5,10 @@
.DS_Store
._*

# Merge files
*.orig
*.rej

# Build artifacts
.clang_complete
.build/