summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
Commit message (Expand)AuthorAgeFilesLines
* Send list of entries to frontendMagnus Ahltorp2016-11-021-20/+32
* Added permdb support to mergeMagnus Ahltorp2016-07-111-3/+3
* Print the string "timing" and the name of the program in merge timing info.Linus Nordberg2015-11-101-1/+1
* Fix harmless cut'n'paste bugs in merge.Linus Nordberg2015-11-101-5/+5
* merge_backup.py and merge_dist.py take nodes on command line.Linus Nordberg2015-11-101-3/+8
* 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