From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Mon, 21 Nov 2016 15:15:33 +0000 (+0100)
Subject: Merge branch 'master' into cgt/devCEA
X-Git-Tag: V_2.6.0~72
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7aed285f4f887151149a909fbb3ec51251826f35;p=modules%2Fshaper.git

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

7aed285f4f887151149a909fbb3ec51251826f35