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

2013-02-08	David A. Velasco	Replaced GPL v3 with GPL v2; PLEASE, note that GPL...	blob \| commitdiff
2013-02-07	David A. Velasco	Updated copyright in source files	blob \| commitdiff \| diff to current
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-21	David A. Velasco	Fix conflict dialog to finish the container activity...	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