masensio 8215c5cc96 Merge branch 'develop' into refactor_remote_operation_to_upload_file ... Conflicts: src/com/owncloud/android/files/services/FileUploader.java		2013-12-16 13:26:45 +01:00
..
authentication	OC-2332: Move ExistenceCheckOperation to the framework. New UpdateRemoteFileOperation class	2013-12-12 10:48:06 +01:00
datamodel	Refactored local deletion to unify through FileDataStorageManager	2013-11-27 09:44:54 +01:00
db	Moved some classes from root package to .utils	2013-11-13 11:17:30 +01:00
files	Merge branch 'develop' into refactor_remote_operation_to_upload_file	2013-12-16 13:26:45 +01:00
media	Moved some classes from root package to .utils	2013-11-13 11:17:30 +01:00
operations	OC-2388: Move ChunkedUploadFileOperation to the framework. UploadFileOperation select operation with or without chunks	2013-12-16 10:46:29 +01:00
providers	Moved some classes from root package to .utils	2013-11-13 11:17:30 +01:00
syncadapter	Added seasonal icon for winter holidays	2013-12-10 13:41:47 +01:00
ui	Merge branch 'develop' into refactor_remote_operation_to_upload_file	2013-12-16 13:26:45 +01:00
utils	Added seasonal icon for winter holidays	2013-12-10 13:41:47 +01:00
widgets	Update packageName	2013-10-29 14:10:42 +01:00
MainApp.java	Refactored to build ownCloud app with oc_framework as dependency	2013-11-12 14:50:44 +01:00