nextcloud-android/src/com/owncloud/android/ui/preview
David A. Velasco b36914df88 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
2013-05-06 10:48:43 +02:00
..
FileDownloadFragment.java Merge branch 'develop' into oauth_login 2013-04-25 19:39:22 +02:00
PreviewImageActivity.java Merge branch 'develop' into oauth_login 2013-04-25 19:39:22 +02:00
PreviewImageFragment.java Merge branch 'develop' into oauth_login 2013-04-25 19:39:22 +02:00
PreviewImagePagerAdapter.java Merge branch 'develop' into oauth_login 2013-04-25 19:39:22 +02:00
PreviewMediaFragment.java Merge branch 'develop' into file_browsing_refactoring 2013-05-06 10:48:43 +02:00
PreviewVideoActivity.java Merge branch 'develop' into oauth_login 2013-04-25 19:39:22 +02:00