Merge branch 'master' into develop

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 3a36849..1b12fb4 100644 (file)
--- 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 e388c7b..6fe153b 100644 (file)
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 7daeea4..f28286a 100644 (file)
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 11cf0ab..1bc470b 100644 (file)
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 8cd92ff..cd8eb07 100644 (file)
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 6997c7e..9008b9d 100644 (file)
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 5bc795a..f7ca7b0 100644 (file)
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