From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Thu, 17 Nov 2016 10:45:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/cgt/devCEA'
X-Git-Tag: V_2.6.0~81
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=857f94a96eb62e69746221f2b919335140b117c6;p=modules%2Fshaper.git

Merge remote-tracking branch 'origin/cgt/devCEA'
---

857f94a96eb62e69746221f2b919335140b117c6