Peters Git server - pub/Android/ownCloud.git/history - src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java

2012-12-05	David A. Velasco	Merge remote-tracking branch 'origin/sync_review_2'	blob \| commitdiff
2012-11-27	David A. Velasco	Some cleanup	blob \| commitdiff
2012-11-26	David A. Velasco	Merge pull request #7 from Mic92/master	blob \| commitdiff \| diff to current
2012-11-23	David A. Velasco	Merge of master after sync_review was merged into it	blob \| commitdiff \| diff to current
2012-11-20	David A. Velasco	Fixed 'keep both' action in conflicts dialog (both...	blob \| commitdiff \| diff to current
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

ownCloud Android App