projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e54dfc
2f237fb
)
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
author
Andy Scherzinger
<info@andy-scherzinger.de>
Mon, 2 Nov 2015 07:41:51 +0000
(08:41 +0100)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Mon, 2 Nov 2015 07:41:51 +0000
(08:41 +0100)
1
2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/utils/DisplayUtils.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/adapter/FileListListAdapter.java
Simple merge
diff --cc
src/com/owncloud/android/utils/DisplayUtils.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff