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

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

diff --git a/.gitignore b/.gitignore
index 9b9bd8e..8346dbf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@
 
 # generated files
 bin/
 
 # generated files
 bin/

+build/
+*.iml

 gen/
 target/
 
 gen/
 target/
 


@@ -30,5 +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
 

-# Should not be commited inside this repo:
-actionbarsherlock/
\ No newline at end of file
+# Android Studio and Gradle specific entries
+.gradle
+.idea
+*.iml
+build
+
+# Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.
+actionbarsherlock
\ No newline at end of file