David A. Velasco 2946d8dd69 Merge branch 'develop' into oauth_login ... Conflicts: AndroidManifest.xml res/values/strings.xml src/com/owncloud/android/Uploader.java src/com/owncloud/android/authentication/AccountAuthenticator.java src/com/owncloud/android/authenticator/AuthenticationRunnable.java src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java src/com/owncloud/android/authenticator/OnConnectCheckListener.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/files/services/FileDownloader.java src/com/owncloud/android/files/services/FileOperation.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/network/OwnCloudClientUtils.java src/com/owncloud/android/operations/RemoteOperationResult.java src/com/owncloud/android/operations/UpdateOCVersionOperation.java src/com/owncloud/android/syncadapter/FileSyncAdapter.java src/com/owncloud/android/ui/activity/AccountSelectActivity.java src/com/owncloud/android/ui/activity/AuthenticatorActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java src/eu/alefzero/webdav/WebdavClient.java		2013-04-25 19:39:22 +02:00
..
account_setup.xml	Merge branch 'develop' into oauth_login	2013-04-25 19:39:22 +02:00