From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 23 Jun 2014 12:55:26 +0000 (+0000)
Subject: Merged trunk@29695,29697 to branches/simantics-1.15 on 2014-06-23 for 1.15.1 release.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b0aded831c3dbdbd77f8d4febd0bfce45410a6bb;p=simantics%2F3d.git

Merged trunk@29695,29697 to branches/simantics-1.15 on 2014-06-23 for 1.15.1 release.

refs #4758
refs #4995


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