projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d2aa0a
3f14bc1
)
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
author
Andy Scherzinger
<info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:43:36 +0000
(13:43 +0200)
committer
Andy Scherzinger
<info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:43:36 +0000
(13:43 +0200)
Conflicts:
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
1
2
build.gradle
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
build.gradle
Simple merge
diff --cc
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge
diff --cc
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff