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

projects / pub / Android / ownCloud.git / history

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / ConflictsResolveDialog.java

2013-06-19	David A. Velasco	Merge branch 'develop'after SPRINT-002	blob \| commitdiff
2013-06-06	masensio	Update branch with develop branch	blob \| commitdiff
2013-05-03	David A. Velasco	Merge branch 'develop' into fixForCrashedSharedContents	blob \| commitdiff
2013-04-25	David A. Velasco	Merge branch 'develop' into oauth_login	blob \| commitdiff
2013-04-17	David A. Velasco	Copyright note fixes	blob \| commitdiff
2013-04-04	David A. Velasco	Merge branch 'develop' into feature_previews	blob \| commitdiff \| diff to current
2013-03-18	David A. Velasco	Merge tag 'oc-android-1-3-22' into oauth_login	blob \| commitdiff \| diff to current
2013-03-14	David A. Velasco	Merge pull request #90 from espenaf/master	blob \| commitdiff \| diff to current
2013-02-08	David A. Velasco	Replaced GPL v3 with GPL v2; PLEASE, note that GPL...	blob \| commitdiff \| diff to current
2013-02-07	David A. Velasco	Updated copyright in source files	blob \| commitdiff \| diff to current
2012-12-18	David A. Velasco	Merge master into oauth_login	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