masensio 71430eb7b1 Merge branch 'develop' into refactor_remote_operation_to_download_file ... Conflicts: oc_framework-test-project/AndroidManifest.xml oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java		2013-12-18 10:04:42 +01:00
..
.settings	OC-1868: Create library project. Add classes to Create FolderOperation	2013-11-07 18:31:54 +01:00
libs	Refactored to build ownCloud app with oc_framework as dependency	2013-11-12 14:50:44 +01:00
res/values	Added empty resources file to avoid conspiracy of git and Android tools to break compilation	2013-11-19 09:39:08 +01:00
src/com/owncloud/android/oc_framework	Merge branch 'develop' into refactor_remote_operation_to_download_file	2013-12-18 10:04:42 +01:00
.classpath	Update classpath: remove jackrabbit library in .classpath of oc_framework	2013-11-28 14:26:51 +01:00
.project	OC-1868: Create library project. Add classes to Create FolderOperation	2013-11-07 18:31:54 +01:00
AndroidManifest.xml	Removed unnceeded resources and reduced AndroidManifest to minimum contents	2013-11-13 10:30:39 +01:00
build.xml	Added project files to build with command line tools	2013-11-13 12:07:07 +01:00
pom.xml	made oc_framework a mvn project	2013-12-12 17:25:53 +01:00
project.properties	Target SDK up	2013-11-12 09:14:30 +01:00