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)
commitc125a1755cc7c4a6241c3c5bf841c3db0ff2d658
treed88f0973386f16cd5eb9e11f923662469ad97e89
parent591f4572f18d20a08a797a8e5c4a8dfc1b3320c1
parent53059ca1a958697cc6235d27628614fbaa944d59
Merge commit '53059ca'

Conflicts:
bundles/org.simantics.scl.runtime/scl/Prelude.scl

refs #6726
refs #6788
refs #6791
bundles/org.simantics.scl.runtime/scl/Prelude.scl