Merge commit '53059ca'
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 3 Nov 2016 20:33:39 +0000 (22:33 +0200)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Thu, 3 Nov 2016 20:33:39 +0000 (22:33 +0200)
Conflicts:
bundles/org.simantics.scl.runtime/scl/Prelude.scl

refs #6726
refs #6788
refs #6791

1  2 
bundles/org.simantics.scl.runtime/scl/Prelude.scl