Merge branch 'develop' into setup_buttons
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 6 Nov 2013 09:36:34 +0000 (10:36 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 6 Nov 2013 09:36:34 +0000 (10:36 +0100)
commitd252a09f53999a90036048d4db33c8b4f2f04c4f
treeebd40eebdd67f7fb86bd727771fc801b5c8085c2
parent186aeca43bfa230043f0e6e793edd322719f5276
parent421951166552a9313f0617487ff9414abf727356
Merge branch 'develop' into setup_buttons
25 files changed:
AndroidManifest.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/CreateFolderOperation.java
src/com/owncloud/android/operations/RemoteOperation.java
src/com/owncloud/android/operations/RemoveFileOperation.java
src/com/owncloud/android/operations/RenameFileOperation.java
src/com/owncloud/android/operations/SynchronizeFileOperation.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/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
src/eu/alefzero/webdav/WebdavClient.java
src/eu/alefzero/webdav/WebdavEntry.java