nextcloud-android/res/menu
jabarros 7d9fc6857e Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
2014-10-09 17:26:02 +02:00
..
account_picker_long_click.xml Added new contextual option in account list to allow the user modify the password 2013-06-21 13:10:13 +02:00
file_actions_menu.xml Changes after CR 2014-09-04 18:23:39 +02:00
main_menu.xml Merge branch 'sortingFiles' of https://github.com/tobiasKaminsky/android into sorting_files 2014-10-09 17:26:02 +02:00