merge master
authorpimjager <pim@pimjager.nl>
Thu, 26 May 2016 14:50:44 +0000 (16:50 +0200)
committerpimjager <pim@pimjager.nl>
Thu, 26 May 2016 14:50:44 +0000 (16:50 +0200)
commit6b40e2512220130342cf8a883887aed0de72b42b
tree0673499e08d8156999237a59e078c2203f94f911
parent3580804138f56148ed7845138633e0bb7b13cae2
parentc2880afc3725715c3a798634228cb6c01b8aec3d
merge master
examples/tempTest.spl
gen.icl
sem.icl