masensio c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update ... Conflicts: res/menu/main_menu.xml 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/preview/PreviewImageActivity.java		2015-05-27 14:19:30 +02:00
..
attrs.xml	initial commit of editbox with badge	2012-05-01 23:37:37 +02:00
bools.xml	Update year in license	2015-03-05 13:27:45 +01:00
colors.xml	Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update	2015-05-21 21:12:44 +02:00
dims.xml	Merge branch 'develop2' into imageGrid2	2015-01-19 21:02:37 +01:00
drawer_resources.xml	Add content_description to Navigation Drawer options	2015-05-26 11:46:15 +02:00
oauth2_configuration.xml	Update packageName	2013-10-29 14:10:42 +01:00
setup.xml	Rename the flag to show my wish that someday the app will allow to share with other users too	2015-05-08 11:17:39 +02:00
strings.xml	Add content_description to Navigation Drawer options	2015-05-26 11:46:15 +02:00
styles.xml	Add actionBar	2015-05-25 12:39:05 +02:00
versioned_styles.xml	Add actionBar	2015-05-25 12:39:05 +02:00