projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e8c9e5b
700c942
)
Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git
author
Lennart Rosam
<lennart@familie-rosam.de>
Wed, 23 May 2012 17:59:51 +0000
(19:59 +0200)
committer
Lennart Rosam
<lennart@familie-rosam.de>
Wed, 23 May 2012 17:59:51 +0000
(19:59 +0200)
1
2
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
Simple merge
diff --cc
src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff