summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorBalz Guenat2017-08-07 21:54:06 +0200
committerBalz Guenat2017-08-07 21:54:06 +0200
commitd18df8ef7a7e0528a29fdc96d4843ace54605121 (patch)
tree44f75b9bccd3efa130d622736726a5f1c83531f6 /.gitignore
parent308bec28bb76f4305d0f084252d7cf207f1b3d83 (diff)
parent933701c2129c0c585ecd8ba37c41b091a7dc687f (diff)
Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts: # keyboards/bananasplit/Makefile # keyboards/bananasplit/bananasplit.c # keyboards/bananasplit/bananasplit.h # keyboards/bananasplit/config.h # keyboards/bananasplit/keymaps/default/keymap.c # keyboards/bananasplit/rules.mk
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index e40308193..a1f3ce471 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,4 +41,7 @@ util/Win_Check_Output.txt
# ignore image files
*.png
*.jpg
-*.gif \ No newline at end of file
+*.gif
+
+# Do not ignore MiniDox left/right hand eeprom files
+!keyboards/minidox/*.eep \ No newline at end of file