From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 30 Jun 2012 11:51:31 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/android-devel
X-Git-Tag: oc-android-1.4.3~323^2~4^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1e63d71c91c8c4ecf048adc719c7158630d5d063?ds=inline;hp=-c

Merge branch 'master' of gitorious.org:owncloud/android-devel
---

1e63d71c91c8c4ecf048adc719c7158630d5d063
diff --combined AndroidManifest.xml
index 935a8fc0,4e9ca6f2..bb1f30e6
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,7 -18,7 +18,7 @@@
   -->
  <manifest package="eu.alefzero.owncloud"
      android:versionCode="1"
-     android:versionName="0.1.134B" xmlns:android="http://schemas.android.com/apk/res/android">
+     android:versionName="0.1.140B" 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" />
@@@ -160,4 -160,4 +160,4 @@@
          <activity android:name="CrashlogSendActivity"></activity>
      </application>
  
 -</manifest>
 +</manifest>