projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c77919b
292870c
)
Merge branch 'develop' into refresh_folder_contents_when_browsed_into
author
masensio
<masensio@solidgear.es>
Tue, 24 Sep 2013 12:57:45 +0000
(14:57 +0200)
committer
masensio
<masensio@solidgear.es>
Tue, 24 Sep 2013 12:57:45 +0000
(14:57 +0200)
1
2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge
diff --cc
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff