From: masensio <masensio@solidgear.es>
Date: Mon, 17 Jun 2013 11:32:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into folderSizeInfo
X-Git-Tag: oc-android-1.4.3~19^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/90428ec4c79e78cc62bad1cec325c28b6f89614f?hp=--cc

Merge remote-tracking branch 'origin/develop' into folderSizeInfo

Conflicts:
	.classpath
	tests/.classpath
---

90428ec4c79e78cc62bad1cec325c28b6f89614f
diff --cc .classpath
index cbaab1ab,d57ec025..2731f9c5
--- a/.classpath
+++ b/.classpath
@@@ -1,9 -1,9 +1,9 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
 -	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 -	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="src" path="gen"/>
--	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
++	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 +	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
++	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
  	<classpathentry kind="output" path="bin/classes"/>
  </classpath>
diff --cc tests/.classpath
index 657a459b,59401260..2731f9c5
--- a/tests/.classpath
+++ b/tests/.classpath
@@@ -1,10 -1,11 +1,9 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
 -	<classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
 -	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 -	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 -	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="src" path="gen"/>
 -	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 +	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 +	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
- 	<classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
++	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
  	<classpathentry kind="output" path="bin/classes"/>
  </classpath>