From: Clarisse Genrault Date: Mon, 21 Nov 2016 13:22:42 +0000 (+0100) Subject: Merge branch 'master' into cgt/devCEA X-Git-Tag: V_2.6.0~75 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9a6ea684d2a091f4c47a5d92d2e939ce45d1f2a0;p=modules%2Fshaper.git Merge branch 'master' into cgt/devCEA --- 9a6ea684d2a091f4c47a5d92d2e939ce45d1f2a0