Peters Git server - pub/Android/ownCloud.git/commit

author	Bartek Przybylski <bart.p.pl@gmail.com>
	Sat, 27 Oct 2012 10:20:52 +0000 (12:20 +0200)
committer	Bartek Przybylski <bart.p.pl@gmail.com>
	Sat, 27 Oct 2012 10:20:52 +0000 (12:20 +0200)
commit	6c32365704be635c38e0a338b727643fa76120f5
tree	3ac832bcea4077b2ddeafb0998696cfe4294927e	tree \| snapshot (tar.gz tar.bz2 zip)
parent	7ebcda4d810a5b509fc51766536fa0918ecf8d82	commit \| diff

Solving modified date and length conflicts

AndroidManifest.xml		diff \| blob \| blame \| history
res/values/strings.xml		diff \| blob \| blame \| history
src/com/owncloud/android/files/OwnCloudFileObserver.java		diff \| blob \| blame \| history
src/com/owncloud/android/files/services/FileObserverService.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/ChunkedUploadFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/RemoteOperationResult.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/SynchronizeFileOperation.java	[new file with mode: 0644]	blob
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java	[new file with mode: 0644]	blob
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java	[new file with mode: 0644]	blob
src/eu/alefzero/webdav/FileRequestEntity.java		diff \| blob \| blame \| history

ownCloud Android App