move back to master branch for SMESH/NETGENPLUGIN

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 23f00149512c1bcb91641c9a0999abee5a05aa03..5dd04745af0f6344604bcd553d7d81db98ec0d46 100644 (file)
--- 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 2c88f00db778871df1b4fae09ecf574f4b76d695..b9874e91e8afd88a6c3b1f11ad4cd9802e481eb2 100644 (file)
--- 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']"