From: rnv Date: Wed, 19 Jul 2017 16:03:05 +0000 (+0300) Subject: Merge branch 'master' into V9_dev X-Git-Tag: V9_0_0~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ecca0c7581981d426caeb7d8399f4030aff57384;hp=d102d95d2793143fefb63cba295490b1828d207f;p=samples%2Fcomponent.git Merge branch 'master' into V9_dev --- diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index ce0373c..127f9c2 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -26,6 +26,7 @@ +