David A. Velasco e6be60679f Merge branch 'master' into copy ... Conflicts FIXED: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java src/com/owncloud/android/ui/preview/FileDownloadFragment.java src/com/owncloud/android/ui/preview/PreviewImageFragment.java src/com/owncloud/android/ui/preview/PreviewMediaFragment.java		2015-09-01 18:35:51 +02:00
..
attrs.xml	merged part of the fixes from material buttons branch to fix bugs reported in PR #1076	2015-08-14 17:18:36 +02:00
bools.xml	Update year in license	2015-03-05 13:27:45 +01:00
colors.xml	fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle	2015-08-18 22:09:53 +02:00
dims.xml	merged part of the fixes from material buttons branch to fix bugs reported in PR #1076	2015-08-14 17:18:36 +02:00
drawer_resources.xml	Disable 'Accounts' in Navigation Drawer	2015-05-29 11:32:36 +02:00
oauth2_configuration.xml	Update packageName	2013-10-29 14:10:42 +01:00
setup.xml	reverted back to light colored login	2015-08-18 17:48:10 +02:00
strings.xml	Merge branch 'master' into copy	2015-09-01 18:35:51 +02:00
styles.xml	fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle	2015-08-18 22:09:53 +02:00
versioned_styles.xml	Add actionBar	2015-05-25 12:39:05 +02:00