Completed update of local database and storage after a successful remote move

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

diff --git a/.gitignore b/.gitignore
index ac30011..9b9bd8e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,18 +13,22 @@ bin/
 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
 

-# 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
 proguard-project.txt

+oc_workaround/proguard-project.txt
+oc_framework/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
 
 # Should not be commited inside this repo:
 actionbarsherlock/
\ No newline at end of file