From ed313c9629d6b5357a3a782ec8bbc1ebc0252631 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Sat, 1 Nov 2014 12:52:19 +0100
Subject: [PATCH] Add IntelliJ and Mac OS X files to gitignore

---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 60c6bbdd3..1c36f1a20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,10 @@
+# IntelliJ
+.idea
+*.iml
+
+# Mac OS X
+.DS_Store
+
 .classpath
 .project
 .settings