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

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

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

+build/
+*.iml

 gen/
 target/
 
 gen/
 target/
 

-# Local configuration file (sdk path, etc)
+# Local configuration files (sdk path, etc)

 local.properties
 local.properties

+oc_workaround/local.properties
+oc_framework/local.properties
+oc_framework-test-project/local.properties
+tests/local.properties

 
 # Mac .DS_Store files
 .DS_Store
 
 # Mac .DS_Store files
 .DS_Store

+
+# Proguard README
+proguard-project.txt
+oc_workaround/proguard-project.txt
+oc_framework/proguard-project.txt
+oc_framework-test-project/proguard-project.txt
+tests/proguard-project.txt
+
+# 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