projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
807047b
9fd493a
)
Merge branch 'develop' into release-1.5.4
author
David A. Velasco
<dvelasco@solidgear.es>
Fri, 7 Feb 2014 11:04:02 +0000
(12:04 +0100)
committer
David A. Velasco
<dvelasco@solidgear.es>
Fri, 7 Feb 2014 11:04:02 +0000
(12:04 +0100)
1
2
owncloud-android-library
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/datamodel/FileDataStorageManager.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
owncloud-android-library
index
815fbba
,
815fbba
..
d673c0a
---
1
/
owncloud-android-library
---
2
/
owncloud-android-library
+++ b/
owncloud-android-library
@@@
-1,1
-1,1
+1,1
@@@
--Subproject commit
815fbba48677e40bff2c3c114c4ce8dd1e35bc17
++Subproject commit
d673c0a20f41b6398fbc81f8e87d3711f0560d68
diff --cc
src/com/owncloud/android/datamodel/FileDataStorageManager.java
Simple merge
diff --cc
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff