Commit graph

3 commits

Author SHA1 Message Date
cxl
db815c90f9 urepo: Conflict fix
git-svn-id: svn://ultimatepp.org/upp/trunk@11425 f0d560ea-af0d-0410-9eb7-867de7ffcac7
2017-11-02 23:30:12 +00:00
cxl
53bc6e18af urepo: Conflict cleanup improvements
git-svn-id: svn://ultimatepp.org/upp/trunk@11422 f0d560ea-af0d-0410-9eb7-867de7ffcac7
2017-11-02 18:53:51 +00:00
cxl
1e61466676 ide: refactoring version control issues
git-svn-id: svn://ultimatepp.org/upp/trunk@11356 f0d560ea-af0d-0410-9eb7-867de7ffcac7
2017-10-08 20:26:03 +00:00