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 (file)
index 0000000..42eba3c
--- /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 8435261..dbd0f5e 100644 (file)
--- 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