summaryrefslogtreecommitdiff
path: root/merge/ebin/merge.app
Commit message (Expand)AuthorAgeFilesLines
* Bump version number.Linus Nordberg2017-02-211-1/+1
* Ready for 0.10.1.Linus Nordberg2017-02-111-1/+1
* Ready for plop-0.10.0, for real this time.Linus Nordberg2017-02-111-1/+1
* Parallelised merge, distribution phase.Linus Nordberg2017-02-011-0/+13