diff options
| author | IBNobody <ibnobody@gmail.com> | 2016-06-11 13:28:27 -0500 |
|---|---|---|
| committer | IBNobody <ibnobody@gmail.com> | 2016-06-11 13:28:27 -0500 |
| commit | 50621a2e6a7d03add0c202e5b2698338c7fbbf5b (patch) | |
| tree | d6f002712c22e8cf4523e04a9da889c7ec379d6b /.gitignore | |
| parent | 26277dbdf40ba7247981361c956ea44c92bf76ea (diff) | |
| parent | d9e4dad0a828a8a904f44dda090a4d6d08fe2948 (diff) | |
Merge remote-tracking branch 'remotes/jackhumbert/master'
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 |