diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-13 16:06:03 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-13 16:06:03 -0400 |
| commit | dc9bf78f2b1d7d894576d87ea9bfc86d7bb3deee (patch) | |
| tree | 44f432118882f9176ef6d901dc3d389d28737254 /.gitignore | |
| parent | d649ab34334ff568448c47a04fcf40f1aa960135 (diff) | |
| parent | 25d4772754186b8ab6ef86c28049da67a460f123 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index a082ea22e4..76d09a6806 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,11 @@ keyboard/planck/dfu-programmer.exe *.o *.eep *.elf -*.hex +/*.hex +/keyboard/**/*.hex +/keyboard/**/keymaps/**/*.hex +!/keyboard/**/keymaps/**/compiled.hex +*.log *.lss *.lst *.map @@ -12,8 +16,11 @@ keyboard/planck/dfu-programmer.exe tags *~ build/ +.build/ *.bak .vagrant/ +.idea/ +CMakeLists.txt .DS_STORE # Eclipse/PyCharm/Other IDE Settings |