summaryrefslogtreecommitdiff
path: root/tools/merge.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-11-19 05:17:26 +0100
committerMagnus Ahltorp <map@kth.se>2014-11-19 05:17:26 +0100
commit1408e8ebc42399ac3a8fb28e9d0df0cacc86bcd7 (patch)
tree0b019c1015fdde2db93846aae96a1664404005ff /tools/merge.py
parentd87233f743b021a5a3d1f959cd6f83d100d5eab8 (diff)
Remove references to jiffyremovejiffy
Diffstat (limited to 'tools/merge.py')
0 files changed, 0 insertions, 0 deletions