Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 23 Oct 2013 15:35:07 +0000 (17:35 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 23 Oct 2013 15:35:07 +0000 (17:35 +0200)
commitdb87c22150ad8a0697ad5191f379647ca1c8ca50
tree5ba0de504bd0c4b9da13dba45b2d96c241641028
parent9d490aaab22f78311e29959b469016f31f1800cb
parentf88f81e906629f244999bfe85fbfeec90985421e
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
15 files changed:
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RemoteOperation.java
src/com/owncloud/android/providers/FileContentProvider.java
src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/syncadapter/FileSyncService.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/eu/alefzero/webdav/WebdavClient.java