From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 18 Nov 2013 07:53:48 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~128
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6ef1a604ec4b15522ae390d1a54cc658883ed764?hp=9431807ec7fee48d393b7b0f71acafb9c37aa336

Merge branch 'master' into develop
---

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 3a36849f..1b12fb49 100644
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100009"
-    android:versionName="1.0.9" >
-
-    <!-- uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="16" /-->
+    android:versionCode="0100010"
+    android:versionName="1.0.10" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="16"
         android:targetSdkVersion="19" />
 
     <application
diff --git a/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png b/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png
index e388c7be..6fe153bb 100644
Binary files a/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png and b/oc_jb_workaround/res/drawable-hdpi/main_app_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png b/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png
index 7daeea4a..f28286a7 100644
Binary files a/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png and b/oc_jb_workaround/res/drawable-hdpi/workaround_app_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png b/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png
index 11cf0ab1..1bc470be 100644
Binary files a/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png and b/oc_jb_workaround/res/drawable-ldpi/main_app_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png b/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png
index 8cd92ff9..cd8eb078 100644
Binary files a/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png and b/oc_jb_workaround/res/drawable-ldpi/workaround_app_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png b/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png
index 6997c7e4..9008b9d3 100644
Binary files a/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png and b/oc_jb_workaround/res/drawable-mdpi/main_app_icon.png differ
diff --git a/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png b/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png
index 5bc795a3..f7ca7b00 100644
Binary files a/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png and b/oc_jb_workaround/res/drawable-mdpi/workaround_app_icon.png differ