From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 4 Dec 2013 11:09:22 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~112
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/34923cf74ba9a09e10276bc919f05ddadc7ab6f7?hp=-c

Merge branch 'master' into develop
---

34923cf74ba9a09e10276bc919f05ddadc7ab6f7
diff --combined AndroidManifest.xml
index f0d00b5c,c47cf8b3..205e5acb
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,8 -18,8 +18,8 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
  <manifest package="com.owncloud.android"
-     android:versionCode="105000"
-     android:versionName="1.5.0" xmlns:android="http://schemas.android.com/apk/res/android">
+     android:versionCode="105001"
+     android:versionName="1.5.1" 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" />
@@@ -63,7 -63,7 +63,7 @@@
   		<activity android:name=".ui.activity.InstantUploadActivity">
          </activity>
          <activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/>
 -        <activity android:name=".Uploader" >
 +        <activity android:name=".ui.activity.Uploader" >
              <intent-filter>
                  <action android:name="android.intent.action.SEND" >
                  </action>
@@@ -113,7 -113,7 +113,7 @@@
          <service
              android:name=".syncadapter.FileSyncService"
              android:exported="true" 
 -            android:process=":sync">
 +            >
              <intent-filter>
                  <action android:name="android.content.SyncAdapter" />
              </intent-filter>