From 0529fb3043ade22838c409107750e3243ed0f86a Mon Sep 17 00:00:00 2001
From: Javier Gonzalez Cuadrado <xgc1986@gmail.com>
Date: Mon, 23 Jun 2014 18:13:00 +0200
Subject: [PATCH] update .gitignore

---
 .gitignore | 57 +++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d2367c..c7763f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +1,36 @@
-#built application files
-*.apk
-*.ap_
+#Android generated
+bin
+gen
+gen*
 
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
+#Eclipse
+.project
+.classpath
+.settings
 
-# generated files
+#IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+out
 
-bin/
-gen/
+#Maven
+target
+release.properties
+pom.xml.*
 
-# Local configuration file (sdk path, etc)
+#Ant
+build.xml
 local.properties
+proguard.cfg
 
-# Windows thumbnail db
-.DS_Store
+#Gradle
+.gradle
+build
 
-# Eclipse project files
-.classpath
-.project
+#OSX
+.DS_Store
 
-# Android Studio
-.idea
-#.idea/workspace.xml - uncomment this and comment/delete .idea if it better suit your needs
-.gradle
-/*/local.properties
-/*/out
-/*/build
-/*/*/build
-/*/*/production
-*.iml
-*.iws
-*.ipr
-*~
-*.swp
 
 !parallaxDemo.apk
\ No newline at end of file