Luke Owncloud 2d0c347bc4 Merge remote-tracking branch 'upstream/develop' into HEAD ... Conflicts: owncloud-android-library src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/FolderPickerActivity.java src/com/owncloud/android/ui/activity/Preferences.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java		2014-12-08 16:24:10 +01:00
..
attrs.xml	initial commit of editbox with badge	2012-05-01 23:37:37 +02:00
bools.xml	REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity	2013-06-04 14:30:29 +02:00
colors.xml	Change the star and downloaded/downloading/uploading icons in list_item layout desing	2014-07-09 09:09:37 +02:00
dims.xml	Adjust the thumbnails size to the size used on screen	2014-11-03 11:27:51 +01:00
oauth2_configuration.xml	Update packageName	2013-10-29 14:10:42 +01:00
setup.xml	Fixed mess created with b9eaffd	2014-09-12 13:49:37 +02:00
strings.xml	Merge remote-tracking branch 'upstream/develop' into HEAD	2014-12-08 16:24:10 +01:00
styles.xml	Added support for sharing files:	2013-11-24 10:00:04 +01:00
versioned_styles.xml	Fixed contrast of text in notifications for Android 2.x and 3.x	2014-03-20 12:56:44 +01:00