Merge branch 'develop' into check_account_existance_in_gallery
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 28 Jun 2013 09:58:43 +0000 (11:58 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 28 Jun 2013 09:58:43 +0000 (11:58 +0200)
commit5b792b044056bc0a547803ff52f30b9da457870e
treef8052778d5b1ea320894b0fa16880cad71c37da5
parent7f34fba421ba20cba626463ff8181ad9f89b5997
parent856038af0d2b8c5e19bee706a53f5010467a55a5
Merge branch 'develop' into check_account_existance_in_gallery
AndroidManifest.xml
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java