summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-03-22 17:29:31 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-03-22 17:29:31 -0400
commita4ff9f256738cf637553e7840d53f778d791fb6f (patch)
tree91d327587401e69843eecb353e97a3119aa9939b /.gitignore
parente36a441274e9e494e1d8e38df1901f3acf9def27 (diff)
parent403d756ad56de18488e3d048e849c55e77a20b32 (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/
+