Merge branch 'develop' into file_browsing_refactoring
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 6 May 2013 08:48:43 +0000 (10:48 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 6 May 2013 08:48:43 +0000 (10:48 +0200)
commitb36914df88ff9abd04c19b422889de894df3a714
tree2ad45a5b598e044cc6c935f7697ec52da7af8630
parent2a95f59adc2bdd8f8a90cab8fd8d28f90bf9fc68
parentfc4819a50495ef76eee1ec757a800d7fcbc409ad
Merge branch 'develop' into file_browsing_refactoring

Conflicts:
AndroidManifest.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
AndroidManifest.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java