From: David A. Velasco <dvelasco@owncloud.com>
Date: Tue, 22 Oct 2013 12:15:21 +0000 (-0700)
Subject: Merge pull request #284 from owncloud/setup_app_name
X-Git-Tag: oc-android-1.5.5~159
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f79e2c0430b9b732d299cbb516c6884715d10e11?ds=inline;hp=--cc

Merge pull request #284 from owncloud/setup_app_name

Setup app name, optional settings, and availability of multiple accounts.
---

f79e2c0430b9b732d299cbb516c6884715d10e11
diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index f4065477,0236a139..32956682
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -28,9 -28,7 +28,8 @@@ import java.util.List
  import java.util.Map;
  import java.util.Vector;
  
- import org.apache.commons.httpclient.Header;
  import org.apache.http.HttpStatus;
 +import org.apache.jackrabbit.webdav.DavConstants;
  import org.apache.jackrabbit.webdav.MultiStatus;
  import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;