Merge branch 'master' into temporal_icons

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index af29747..87458dd 100644 (file)
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?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="0100000"
+    android:versionCode="0100001"
     android:versionName="1.0" >
 
     <uses-sdk

diff --git a/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png
index 32985e3..7daeea4 100644 (file)
Binary files a/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png and b/oc_jb_workaround/res/drawable-hdpi/oc_workaround_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png
index 03fa38b..8cd92ff 100644 (file)
Binary files a/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png and b/oc_jb_workaround/res/drawable-ldpi/oc_workaround_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png
index 78cd3ed..5bc795a 100644 (file)
Binary files a/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png and b/oc_jb_workaround/res/drawable-mdpi/oc_workaround_icon.png differ

diff --git a/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png b/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png
index d8a924c..7daeea4 100644 (file)
Binary files a/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png and b/oc_jb_workaround/res/drawable-xhdpi/oc_workaround_icon.png differ