GEEN MERGE CONFLICT
authorMart Lubbers <mart@martlubbers.net>
Thu, 26 May 2016 14:37:34 +0000 (16:37 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 26 May 2016 14:37:34 +0000 (16:37 +0200)
commit3b0239180564fa383f6206b4726bccc1e7969609
tree8c3c00683081038aac6d4368597c824c7161b532
parenta0042ab853a72773c94b51cd57cafb2849eb6325
GEEN MERGE CONFLICT
examples/test.spl
gen.icl