summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorCallum Oakley <callum@pusher.com>2017-08-19 10:34:45 +0100
committerCallum Oakley <callum@pusher.com>2017-08-19 10:34:45 +0100
commita6845036e25c4f4d936dcd12cd0ddedd2894b30e (patch)
treeb23b4e8d9d757aa3c0d42be561572533ae0d126c /.gitignore
parent84a8aabe5bf8807595f98de44d18f6a31b892edf (diff)
parent7277f09bbadcce120f819132dec8ff7172caacc4 (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 9381f1afe4..a1f3ce4719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ quantum/version.h
CMakeLists.txt
.DS_STORE
/util/wsl_downloaded
+/util/win_downloaded
# Eclipse/PyCharm/Other IDE Settings
.cproject
@@ -32,10 +33,15 @@ CMakeLists.txt
.browse.VC.db*
*.stackdump
util/Win_Check_Output.txt
-.vscode
+# Let these ones be user specific, since we have so many different configurations
+.vscode/launch.json
+.vscode/tasks.json
.stfolder
# 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