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

[qmk_firmware.git] / .gitignore

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