summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLucas Hecht <Lucas Hecht>2016-02-25 21:40:16 +0100
committerLucas Hecht <Lucas Hecht>2016-02-25 21:40:16 +0100
commit34a7012a33cb17687a837990426e1058f34acb6d (patch)
tree49d040286f15164c735566b63e92f51580caeda6 /.gitignore
parentbbfdfdcc5f5f610371434c7f4d072c71f1526696 (diff)
parent11c591c30dc8743b1980f6f639f26cbe250181e7 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jackhumbert-master
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