summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
Commit message (Expand)AuthorAgeFilesLines
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-48/+54
* Get the imports correct.Linus Nordberg2015-11-101-2/+2
* Split merge.py into three pieces.Linus Nordberg2015-11-101-0/+130