summaryrefslogtreecommitdiff
path: root/tools/merge_sth.py
Commit message (Expand)AuthorAgeFilesLines
* Merge is now run by shell script tools/merge.Linus Nordberg2015-09-271-0/+123