From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 19 Nov 2013 10:25:30 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_operation_to_rename_folder
X-Git-Tag: oc-android-1.5.5~123^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f6ac875ce56f67ee30d8894674f26fcbf08317e6?hp=0b95d61cec827574b419939b2524aef35890d7d8

Merge branch 'develop' into refactor_remote_operation_to_rename_folder
---

diff --git a/oc_framework/res/values/empty.xml b/oc_framework/res/values/empty.xml
new file mode 100644
index 00000000..42eba3cc
--- /dev/null
+++ b/oc_framework/res/values/empty.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>
diff --git a/project.properties b/project.properties
index 84352610..dbd0f5e5 100644
--- a/project.properties
+++ b/project.properties
@@ -9,5 +9,5 @@
 
 # Project target.
 target=android-19
-android.library.reference.1=actionbarsherlock\\library
+android.library.reference.1=actionbarsherlock/library
 android.library.reference.2=oc_framework