Merge branch 'master' of https://github.com/owncloud/android into material_fab

[pub/Android/ownCloud.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e13e5a5..8346dbf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 # generated files
 bin/
 build/
 # generated files
 bin/
 build/

+*.iml

 gen/
 target/
 
 gen/
 target/
 


@@ -31,15 +32,11 @@ oc_framework/proguard-project.txt
 oc_framework-test-project/proguard-project.txt
 tests/proguard-project.txt
 
 oc_framework-test-project/proguard-project.txt
 tests/proguard-project.txt
 

-# IntelliJ and Gradle specific entries
+# Android Studio and Gradle specific entries

 .gradle
 .gradle

-.idea/workspace.xml
-.idea/tasks.xml
-.idea/libraries/*.xml
-dataSources.ids
-datasources.xml 
-gradle.xml
+.idea
+*.iml

 build
 
 # Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.
 build
 
 # Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.

-actionbarsherlock
+actionbarsherlock
\ No newline at end of file