From a23dbe84ec6e9e163734d2cd9b7492acce593ce4 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Fri, 12 Sep 2014 23:57:37 +0200
Subject: [PATCH] Fancify .gitignore a little bit

---
 .gitignore | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee1e6574..6fa8deb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,31 @@
-# Eclipse stuff
+# Eclipse
 /.classpath
 /.project
 /.settings
+/*.jardesc
+
+# IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
 
 # NetBeans
 /nbproject
-/build.xml
 
 # vim
 .*.sw[a-p]
 
+# Maven
+/build.xml
+/target
+/dependency-reduced-pom.xml
+
 # various other potential build files
 /build
 /bin
 /dist
-/localexport.jardesc
-/dependency-reduced-pom.xml
+/manifest.mf
 
 # Mac filesystem dust
 .DS_Store
-/target