aboutsummaryrefslogtreecommitdiff
path: root/merge.py
Commit message (Expand)AuthorAgeFilesLines
* add license info to merge.pyFlorian Fischer2019-08-271-1/+27
* move scripts from scripts/ to root and fix some pylint hintsFlorian Fischer2019-08-261-0/+55