[tx-robot] updated from transifex

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

diff --git a/.gitignore b/.gitignore
index ac30011..8346dbf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,21 +10,33 @@
 
 # generated files
 bin/
+build/
+*.iml
 gen/
 target/
 
-# Local configuration file (sdk path, etc)
+# Local configuration files (sdk path, etc)
 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
 
-# These files are created automatically by Eclipse:
-tests/proguard-project.txt
-tests/project.properties
-tests/ant.properties
-tests/build.xml
+# 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
 
-# Should not be commited inside this repo:
-actionbarsherlock/
\ No newline at end of file
+# Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.
+actionbarsherlock
\ No newline at end of file