Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)

[qmk_firmware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8b8c45169dfbce194a603de23869fcb09d4ce5b3..1ff0f2fa98be40892faf3f615e75037cfbbf436b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,13 @@
-keyboard/planck/dfu-programmer.exe
+keyboards/planck/dfu-programmer.exe
 .dep
 *.o
 *.eep
 *.elf
-*.hex
+/*.hex
+/keyboards/**/*.hex
+/keyboards/**/keymaps/**/*.hex
+!/keyboards/**/keymaps/**/compiled.hex
+*.log
 *.lss
 *.lst
 *.map
@@ -12,12 +16,15 @@ keyboard/planck/dfu-programmer.exe
 tags
 *~
 build/
+.build/
 *.bak
 .vagrant/
+.idea/
+CMakeLists.txt
 .DS_STORE
 
-# Eclipse Settings
+# Eclipse/PyCharm/Other IDE Settings
 .cproject
 .project
 .settings/
-
+.idea