From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 9 Jul 2014 10:27:35 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.5.8
X-Git-Tag: oc-android-1.7.0_signed~125^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/49c69609eaba304a740b1a8dbd37e619d0fb82cf?ds=inline;hp=-c

Merge branch 'develop' into release-1.5.8
---

49c69609eaba304a740b1a8dbd37e619d0fb82cf
diff --combined AndroidManifest.xml
index 8d5b6307,f41f2f4a..7a3b1fc3
--- 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="105007"
 -    android:versionName="1.5.7" xmlns:android="http://schemas.android.com/apk/res/android">
 +    android:versionCode="10500800"
 +    android:versionName="1.5.8" 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" />
@@@ -187,7 -187,7 +187,7 @@@
                  <action android:name="android.intent.action.BOOT_COMPLETED"/>
              </intent-filter>
          </receiver>
-         <service android:name=".files.services.FileObserverService"/>
+         <service android:name=".services.observer.FileObserverService"/>
          
          <activity 
              android:name=".ui.activity.CopyToClipboardActivity"