Enhanced .gitignore

bartoszmajsak · bartoszmajsak · commit ee84bd0a0af8 · 2013-12-04T21:37:49.000+01:00
Changes mainly for netbeans and intellij. Plus some small cleanups.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
 # Directories #
-/build/
-/bin/
+build/
+bin/
 target/
 libs/
+tmp/
  
 # OS Files #
 .DS_Store
@@ -43,12 +44,23 @@ Desktop.ini
 ######################
 # NetBeans
 ######################
+nbproject/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
 nb-configuration.xml
  
 ######################
 # IDEA
 ######################
 *.iml
+*.ipr
+*.iws
+.idea/
+atlassian-ide-plugin.xml
+
  
 ######################
 # Eclipse
@@ -57,9 +69,6 @@ nb-configuration.xml
 *.pydevproject
 .project
 .metadata
-bin/**
-tmp/**
-tmp/**/*
 *.tmp
 *.bak
 *.swp
@@ -68,7 +77,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
-/src/main/resources/rebel.xml
+
 # External tool builders
 .externalToolBuilders/
  
