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

author	David A. Velasco <dvelasco@solidgear.es>
	Tue, 20 Nov 2012 13:12:32 +0000 (14:12 +0100)
committer	David A. Velasco <dvelasco@solidgear.es>
	Tue, 20 Nov 2012 13:12:32 +0000 (14:12 +0100)
commit	195b0092129ba4e38c6bb7981022a63c7a0cdfc4
tree	6c810c6b59cfa85b2d3b2f0af11d4fb91186eb45	tree \| snapshot (tar.gz tar.bz2 zip)
parent	69ac5b6bfb63327e64edc718bdcd9a5f2c7c161b	commit \| diff

Fixed 'keep both' action in conflicts dialog (both resulting file were linked to the same local file in the device)

ownCloud Android App

src/com/owncloud/android/files/OwnCloudFileObserver.java		diff \| blob \| blame \| history
src/com/owncloud/android/files/services/FileUploader.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/UploadFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/fragment/FileDetailFragment.java		diff \| blob \| blame \| history