summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-02-25 13:03:44 -0500
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-02-25 13:03:44 -0500
commitd3d1f15597246512aabbb21e78fd86017bf17e19 (patch)
treed8a156f52240e55990da6ca96a0773bfdf89f94d /.gitignore
parenteb99e515b3b058781fc57a2f7db130b6bc73281e (diff)
parent11c591c30dc8743b1980f6f639f26cbe250181e7 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1e19ce9a87..ae342167df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,9 @@ tags
build/
*.bak
.vagrant/
-.DS_STORE \ No newline at end of file
+.DS_STORE
+
+# Eclipse Settings
+.cproject
+.project
+.settings/ \ No newline at end of file