From: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Date: Thu, 11 Aug 2016 15:28:50 +0000 (+0200)
Subject: Merge from master to omu/insitu.
X-Git-Tag: SHAPER_2.7.0~15^2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=143ae4787e3f83cb3ab54d07b757fe664b0ecfea;p=modules%2Fparavis.git

Merge from master to omu/insitu.
---

143ae4787e3f83cb3ab54d07b757fe664b0ecfea