David A. Velasco 2b5785556e Merge branch 'master' into oauth_login ... Conflicts: AndroidManifest.xml res/values-de-rDE/strings.xml res/values-de/strings.xml res/values/strings.xml src/com/owncloud/android/Uploader.java src/com/owncloud/android/datamodel/FileDataStorageManager.java src/com/owncloud/android/files/OwnCloudFileObserver.java src/com/owncloud/android/files/services/FileDownloader.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/operations/RemoteOperationResult.java src/com/owncloud/android/syncadapter/FileSyncAdapter.java src/com/owncloud/android/ui/activity/AuthenticatorActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/UploadFilesActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java		2013-01-17 14:25:49 +01:00
..
managers	moving from eu.alefzero.eu to com.owncloud.android	2012-07-31 17:43:37 +02:00
services	Merge branch 'master' into oauth_login	2013-01-17 14:25:49 +01:00
BootupBroadcastReceiver.java	add licence header to files	2012-10-28 00:12:15 +02:00
InstantUploadBroadcastReceiver.java	Merge master into oauth_login	2012-12-18 11:20:03 +01:00
OwnCloudFileObserver.java	Merge branch 'master' into oauth_login	2013-01-17 14:25:49 +01:00