David A. Velasco 77ddd1ccb6 Merge branch 'develop' into feature_previews ... Conflicts: AndroidManifest.xml res/menu/file_context_menu.xml res/menu/menu.xml res/values-de-rDE/strings.xml res/values/strings.xml src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java		2013-04-04 16:44:30 +02:00
..
account_picker.xml	Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished	2013-02-08 09:22:46 +01:00
account_picker_long_click.xml	Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished	2013-02-08 09:22:46 +01:00
file_actions_menu.xml	Merge branch 'develop' into feature_previews	2013-04-04 16:44:30 +02:00
main_menu.xml	Merge branch 'develop' into feature_previews	2013-04-04 16:44:30 +02:00
session_context_menu.xml	Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished	2013-02-08 09:22:46 +01:00