aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorkLeZ <julius8774@gmail.com>2014-09-22 19:18:04 +0200
committerkLeZ <julius8774@gmail.com>2014-09-22 19:18:04 +0200
commit1e860374e2df56bbbbbb70ad6c32729655c5898c (patch)
treee2de73fade3e1c5f224dcc54321c05922697c945 /.gitignore
parentf28f8cdb65d7d2fc3436d16a342e61b9154ad817 (diff)
parent7af6cb37ce4ef4e9fbe1aa6bab6149d68c7f3e53 (diff)
Merge remote-tracking branch 'origin/eclipse-integration'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6ffad81e..4873def8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,10 @@ pom.xml.*
.settings
.metadata
+#Eclipse/Gradle integration
+libs
+project.properties
+
#IntelliJ IDEA
.idea
*.iml