From: rnv <rnv@opencascade.com>
Date: Thu, 28 Dec 2017 14:15:57 +0000 (+0300)
Subject: Merge changes from 'master' branch.
X-Git-Tag: V9_0_0^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV9_dev;p=samples%2Fatomsolv.git

Merge changes from 'master' branch.
---

99ab39e9e33c649bcd9fee7e0d3ae379e80a078d