summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLucas Hecht <Lucas Hecht>2016-02-25 21:45:28 +0100
committerLucas Hecht <Lucas Hecht>2016-02-25 21:45:28 +0100
commitcae9993a25675cca5d91ffed34b64f46c2c7aacc (patch)
tree49d040286f15164c735566b63e92f51580caeda6 /.gitignore
parent6280adbb6e077d9c73807788929158bf4a8ca493 (diff)
parent34a7012a33cb17687a837990426e1058f34acb6d (diff)
Merge branch '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