nextcloud-android/oc_framework-test-project/oc_framework-test-test
masensio 39c2fffbfe Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java
	oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
	oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
2013-12-02 12:40:29 +01:00
..
.settings OC-1869: Create Unit test project 2013-11-12 12:36:13 +01:00
res OC-1869: Create Unit test project 2013-11-12 12:36:13 +01:00
src/com/owncloud/android/oc_framework_test_project/test Merge branch 'develop' into refactor_remote_operation_to_read_file 2013-12-02 12:40:29 +01:00
.classpath Fixed test of oc_framework; more simple initialization 2013-11-19 14:53:11 +01:00
.project OC-1869: Create Unit test project 2013-11-12 12:36:13 +01:00
AndroidManifest.xml OC-1869: Create Unit test project 2013-11-12 12:36:13 +01:00
project.properties OC-1869: Create Unit test project 2013-11-12 12:36:13 +01:00