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

[qmk_firmware.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f3f46872a07e990dcf0f8dca6c8de554d0fdce66..8b8c45169dfbce194a603de23869fcb09d4ce5b3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+keyboard/planck/dfu-programmer.exe
 .dep
 *.o
 *.eep
@@ -7,7 +8,16 @@
 *.lst
 *.map
 *.sym
+*.swp
 tags
 *~
 build/
 *.bak
+.vagrant/
+.DS_STORE
+
+# Eclipse Settings
+.cproject
+.project
+.settings/
+