projects
/
pub
/
Android
/
ownCloud.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge of master after sync_review was merged into it
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
activity
/
ConflictsResolveActivity.java
2012-11-23
David A. Velasco
Merge of master after sync_review was merged into it
blob
|
commitdiff
2012-11-20
David A. Velasco
Fixed 'keep both' action in conflicts dialog (both...
blob
|
commitdiff
2012-11-20
David A. Velasco
ConlictsResolveActivity is finished when the user cance...
blob
|
commitdiff
|
diff to current
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