projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d6888f4
65f8034
)
Merge branch 'switchListVsGridMaster' into beta
author
tobiasKaminsky
<tobias@kaminsky.me>
Thu, 29 Oct 2015 16:55:56 +0000
(17:55 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Thu, 29 Oct 2015 16:55:56 +0000
(17:55 +0100)
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge
diff --cc
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge
diff --cc
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff