From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 4 Oct 2022 10:30:26 +0000 (+0200)
Subject: merge from master
X-Git-Tag: V9_11_0~267
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=95d758efdf656ce2e8a5f69d38dee529236f549e;p=tools%2Fsat_salome.git

merge from master
---

95d758efdf656ce2e8a5f69d38dee529236f549e
diff --cc applications/SALOME-master-native.pyconf
index b910bb2,1bddfd7..00f14c3
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@@ -37,8 -37,7 +37,8 @@@ APPLICATION 
          Babel : 'native'
          boost : 'native'
          #CAS : 'CR753-SALOME-PATCH'
-         CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH', base: 'no'}
+         CAS : {tag : '080db9d', section: 'version_CR753_SALOME_PATCH', base: 'no'}
 +        catalyst: '2.0'
          C3PO: 'v2.0'
          certifi : 'native'
          cgns : '4.2.0'
diff --cc applications/SALOME-master.pyconf
index 0cf0801,a371a7a..6f619dd
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@@ -37,8 -37,7 +37,8 @@@ APPLICATION 
          Babel : '2.7.0'
          boost : '1.71.0'
          #CAS : 'CR753-SALOME-PATCH'
-         CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH', base: 'no'}
+         CAS : {tag : '080db9d', section: 'version_CR753_SALOME_PATCH', base: 'no'}
 +        catalyst: '2.0'
          C3PO: 'v2.0'
          certifi : '2018.8.24'
          cgns : '4.2.0'