From 25cd745c45e98a58edb8cd3078b20a0ecd83a6c5 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 13 May 2015 11:51:56 +0200
Subject: Initial commit

---
 .gitignore | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index ccf2efe..5b11a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,33 @@
-# Built application files
+#built application files
 *.apk
 *.ap_
 
-# Files for the Dalvik VM
+# files for the dex VM
 *.dex
 
 # Java class files
 *.class
 
-# Generated files
+# generated files
 bin/
 gen/
 
-# Gradle files
-.gradle/
-build/
-/*/build/
-
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Proguard folder generated by Eclipse
-proguard/
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
 
-# Log Files
-*.log
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+*.iml
+.idea
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
-- 
cgit v1.2.3