summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorStephan Bösebeck <sb@caluga.de>2016-03-08 23:56:50 +0100
committerStephan Bösebeck <sb@caluga.de>2016-03-08 23:56:50 +0100
commit3119778e0cef697d78b5f425822382a455cf6d36 (patch)
tree3bcb802e2bb133765c04e7bd81da04b172017bf2 /.gitignore
parent98fe40caa7b862a26f8900f8b9547f8c9b61726b (diff)
parent7d3ebd7b40b96f576fe4608b33f47329c334925b (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ae342167df..8b8c45169d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+keyboard/planck/dfu-programmer.exe
.dep
*.o
*.eep
@@ -18,4 +19,5 @@ build/
# Eclipse Settings
.cproject
.project
-.settings/ \ No newline at end of file
+.settings/
+