From: Nabil Ghodbane Date: Wed, 29 Mar 2023 13:35:19 +0000 (+0200) Subject: move back to master branch for SMESH/NETGENPLUGIN X-Git-Tag: V9_11_0~78 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9fa7d98859a47a78c65846b81adb82333315f57f;p=tools%2Fsat_salome.git move back to master branch for SMESH/NETGENPLUGIN --- diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 23f0014..5dd0474 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -142,8 +142,8 @@ APPLICATION : 'MEDCOUPLING' 'GUI' 'GEOM' - 'SMESH' : 'yan/parallel_mesh_win' - 'NETGENPLUGIN' : 'yan/parallel_mesh_win' + 'SMESH' + 'NETGENPLUGIN' 'BLSURFPLUGIN' 'GHS3DPLUGIN' 'HYBRIDPLUGIN' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 2c88f00..b9874e9 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -222,8 +222,6 @@ __overwrite__ : { __condition__ : "VARS.dist in ['CO7']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] - 'APPLICATION.products.SMESH' : 'yan/parallel_mesh_win' - 'APPLICATION.products.NETGENPLUGIN' : 'yan/parallel_mesh_win' } { __condition__ : "VARS.dist in ['CO8']"