move back to master branches

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index afe2b4987240a7384855f39df6880e108ec3405b..3d91d891f3d12219866dc4cfc0881917a4c7c6b1 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-master-native'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_9_0a2'
+    tag : 'master'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -145,7 +145,7 @@ APPLICATION :
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
-        'MEDCOUPLING' : {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -161,7 +161,7 @@ APPLICATION :
         'HOMARD'
         'FIELDS'
         'OPENTURNS_SALOME'
-        'PARAVIS': {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
@@ -177,7 +177,7 @@ APPLICATION :
         'EFICAS_TOOLS'
         'PY2CPP'
         'ADAO'
-        'ADAO_INTERFACE' : 'ce77875' #FIXME
+        'ADAO_INTERFACE'
         'PARAVISADDONS'
         'YDEFX'
         'pmml'

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index deaa519a8f73d4380b8a5d8e35b593d862a2e25d..9c9987f2028dbb5b630a447c634f11a61fd42327 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -6,7 +6,7 @@ APPLICATION :
     name : 'SALOME-master'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
     cmake_generator : 'Visual Studio 15 2017 Win64'
-    tag : 'V9_9_0a2'
+    tag : 'master'
     dev : 'no'
     verbose :'no'
     debug : 'no'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 954dd0cfe836261c35df02d32ea023cd259ad702..8023e3acd49b8c589aafc2eb95019d0364fc5d0c 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-master'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_9_0a2'
+    tag : 'master'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -140,7 +140,7 @@ APPLICATION :
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_5'}
         'KERNEL'
-        'MEDCOUPLING' : {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -156,7 +156,7 @@ APPLICATION :
         'HOMARD'
         'FIELDS'
         'OPENTURNS_SALOME'
-        'PARAVIS' : {tag:'V9_9_0a2', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
@@ -172,7 +172,7 @@ APPLICATION :
         'EFICAS_TOOLS'
         'PY2CPP'
         'ADAO'
-        'ADAO_INTERFACE' : 'ce77875' #FIXME
+        'ADAO_INTERFACE'
         'PARAVISADDONS'
         'YDEFX'
         'pmml'