From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 31 Jan 2013 11:50:03 +0000 (+0100)
Subject: Merge branch 'master' into temporal_icons
X-Git-Tag: oc-android-1.4.3~57
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/82ee5c46eea51198eb055eec84526673fd04e977?hp=13b75b73e3dcd7c6794f9beee4a538fc900bc94d

Merge branch 'master' into temporal_icons
---

diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index af29747a..87458dd2 100644
--- 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 32985e36..7daeea4a 100644
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 03fa38be..8cd92ff9 100644
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 78cd3ed4..5bc795a3 100644
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 d8a924c3..7daeea4a 100644
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