summaryrefslogtreecommitdiff
path: root/tools/merge.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-11-19 05:17:26 +0100
committerLinus Nordberg <linus@nordberg.se>2015-02-20 14:12:47 +0100
commit9168bd99fcbd53ca3d7714fb4e1c883dcd8cbd9c (patch)
treea6dfd41a6f09280e020155980e140b6deae3a03b /tools/merge.py
parentffe6f80e1696a4bb0c9378549661116650109662 (diff)
Remove references to jiffy
Diffstat (limited to 'tools/merge.py')
0 files changed, 0 insertions, 0 deletions