projects
/
pub
/
Android
/
ownCloud.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Added MediaController user interface to handle audio files in the MediaService
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
dialog
/
ConflictsResolveDialog.java
2012-11-26
David A. Velasco
Merge pull request #7 from Mic92/master
blob
|
commitdiff
2012-11-23
David A. Velasco
Merge of master after sync_review was merged into it
blob
|
commitdiff
2012-11-21
David A. Velasco
Fix conflict dialog to finish the container activity...
blob
|
commitdiff
2012-10-27
Bartek Przybylski
add licence header to files
blob
|
commitdiff
|
diff to current
2012-10-27
Bartek Przybylski
Solving modified date and length conflicts
blob
|
commitdiff
|
diff to current
projects / pub / Android / ownCloud.git / history