summaryrefslogtreecommitdiff
path: root/tools/merge
Commit message (Expand)AuthorAgeFilesLines
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-0/+8