David A. Velasco 5665d9c306 Merge tag 'oc-android-1-3-22' into oauth_login ... Conflicts: AndroidManifest.xml src/com/owncloud/android/authenticator/AuthenticationRunnable.java src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java src/com/owncloud/android/authenticator/OnConnectCheckListener.java src/com/owncloud/android/files/services/FileOperation.java src/com/owncloud/android/files/services/InstantUploadService.java src/com/owncloud/android/ui/activity/AuthenticatorActivity.java		2013-03-18 14:28:49 +01:00
..
attrs.xml	initial commit of editbox with badge	2012-05-01 23:37:37 +02:00
bools.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
colors.xml	Removed usused drawable; list_selector rewritten from scratch with new license (and color fixed for Android before ICS)	2013-02-08 11:37:02 +01:00
oauth.xml	Refresh authorization token on failed synchronizations when notification error is clicked	2013-03-18 14:05:34 +01:00
strings.xml	Merge tag 'oc-android-1-3-22' into oauth_login	2013-03-18 14:28:49 +01:00
styles.xml	Merge tag 'oc-android-1-3-22' into oauth_login	2013-03-18 14:28:49 +01:00
urls.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