From: rnv Date: Wed, 6 Jun 2018 11:43:11 +0000 (+0300) Subject: Merge V9_dev branch into master X-Git-Tag: SHAPER_V9_1_0RC1~7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e983ec0aa641f7f75ea93c355ba7adeb9b65595d;p=tools%2Fconfiguration.git Merge V9_dev branch into master --- e983ec0aa641f7f75ea93c355ba7adeb9b65595d diff --cc config/salome.xml index b71249f,1e83e15..ad2b5be --- a/config/salome.xml +++ b/config/salome.xml @@@ -132,44 -135,48 +132,48 @@@ - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +