From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 23 Dec 2015 09:23:46 +0000 (+0000)
Subject: Merged trunk@r32097:32150 to branches/e4 on 2015-12-23 for e4 branch.
X-Git-Tag: simantics-1.21.0~1^2~1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=fe0e34d8b4784216a71789c6e53fa5ab8b4a8034;p=simantics%2F3d.git

Merged trunk@r32097:32150 to branches/e4 on 2015-12-23 for e4 branch.

refs #6221
refs #3537


git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/e4@32153 ac1ea38d-2e2b-0410-8846-a27921b304fc
---