diff options
author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-22 11:26:26 -0400 |
---|---|---|
committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-22 11:26:26 -0400 |
commit | b0caf32741cf415a45333828f1661d9f6b72570f (patch) | |
tree | 5e2b8203ab232c0a89264e96716ebf1a859f6189 /.gitignore | |
parent | ee3c7892ad585e2e702d8975420d25ae052d97bb (diff) | |
parent | 8c1bfdf0bd9aae13d8722fd107deca40ffc7932c (diff) | |
download | qmk_firmware-b0caf32741cf415a45333828f1661d9f6b72570f.tar.gz qmk_firmware-b0caf32741cf415a45333828f1661d9f6b72570f.zip |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 76d09a6806..1ff0f2fa98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -keyboard/planck/dfu-programmer.exe +keyboards/planck/dfu-programmer.exe .dep *.o *.eep *.elf /*.hex -/keyboard/**/*.hex -/keyboard/**/keymaps/**/*.hex -!/keyboard/**/keymaps/**/compiled.hex +/keyboards/**/*.hex +/keyboards/**/keymaps/**/*.hex +!/keyboards/**/keymaps/**/compiled.hex *.log *.lss *.lst |