projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
423b208
4fc29cf
)
Merge remote-tracking branch 'remotes/upstream/switchListVsGrid' into beta
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 13 Nov 2015 16:42:02 +0000
(17:42 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 13 Nov 2015 16:42:02 +0000
(17:42 +0100)
1
2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/preview/PreviewTextFragment.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/FileDetailFragment.java
Simple merge
diff --cc
src/com/owncloud/android/ui/preview/PreviewTextFragment.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff