From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Tue, 21 Feb 2017 15:14:42 +0000 (+0100)
Subject: Merge branch 'master' into cgt/devCEA
X-Git-Tag: V_2.7.0~270
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=94ca85ef974b0954692ce0dedf578f7427e939ad;p=modules%2Fshaper.git

Merge branch 'master' into cgt/devCEA
---

94ca85ef974b0954692ce0dedf578f7427e939ad