projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
af6815a
1c6fcdb
)
Merge remote-tracking branch 'origin/oc_framework_cleanup_and_documentation' into...
author
David A. Velasco
<dvelasco@solidgear.es>
Mon, 20 Jan 2014 08:24:12 +0000
(09:24 +0100)
committer
David A. Velasco
<dvelasco@solidgear.es>
Mon, 20 Jan 2014 08:24:12 +0000
(09:24 +0100)
1
2
oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
oc_framework/src/com/owncloud/android/oc_framework/operations/remote/DownloadRemoteFileOperation.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
oc_framework/sample_client/src/com/owncloud/android/oc_framework/sampleclient/MainActivity.java
Simple merge
diff --cc
oc_framework/src/com/owncloud/android/oc_framework/operations/remote/DownloadRemoteFileOperation.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff