Merge branch 'develop' into release-1.5.3

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 80fc7e3..c1202e6 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="105002"
-    android:versionName="1.5.2" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="105003"
+    android:versionName="1.5.3" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 46e9269..ea25105 100644 (file)
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?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="0100011"
-    android:versionName="1.0.11" >
+    android:versionCode="0100012"
+    android:versionName="1.0.12" >
 
     <uses-sdk
         android:minSdkVersion="16"

diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png
new file mode 100644 (file)
index 0000000..041efc6
Binary files /dev/null and b/res/drawable-xhdpi/icon.png differ