From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 13 Nov 2013 11:04:07 +0000 (+0100)
Subject: Allow the upload of project.properties and ant.properties files
X-Git-Tag: oc-android-1.5.5~123^2~12^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/02edfaeea0269512040de691a0a55f004fb67db6?hp=--cc

Allow the upload of project.properties and ant.properties files
---

02edfaeea0269512040de691a0a55f004fb67db6
diff --git a/.gitignore b/.gitignore
index ac30011b..9b9bd8e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,18 +13,22 @@ bin/
 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
 
 # Should not be commited inside this repo:
 actionbarsherlock/
\ No newline at end of file