summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
Commit message (Expand)AuthorAgeFilesLines
* merge_backup.py and merge_dist.py take nodes on command line.Linus Nordberg2015-09-251-3/+8
* Merge is now run by shell script tools/merge.Linus Nordberg2015-09-241-48/+54
* Get the imports correct.Linus Nordberg2015-09-221-2/+2
* Split merge.py into three pieces.Linus Nordberg2015-09-221-0/+130