Merge branch 'master' of github.com:jackhumbert/qmk_firmware

[qmk_firmware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 83f3f2da9695e81aba571b715b6ebc2444d43b2e..8491433524d9c7c8b1f0878995c8fc7fb2616bfc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
-keyboard/planck/dfu-programmer.exe
 .dep
 *.o
 *.eep
 *.elf
 *.hex
+!util/bootloader.hex
+!quantum/tools/eeprom_reset.hex
 *.log
 *.lss
 *.lst
@@ -13,6 +14,7 @@ keyboard/planck/dfu-programmer.exe
 tags
 *~
 build/
+.build/
 *.bak
 .vagrant/
 .idea/
@@ -24,3 +26,4 @@ CMakeLists.txt
 .project
 .settings/
 .idea
+.browse.VC.db*
\ No newline at end of file