Merge V8_3_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65b5c7e04390abec6c2b96db849688503798e976..4e21fc0b296290a54e1f8d25a9f562b224a30abd 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc
index 819954739b1b9ebd7cb7948520a95cc63165d277..ec7d33c7e5249a68324a7ac0001e1f645ba99f47 100644 (file)
--- a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc
+++ b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc
@@ -123,7 +123,7 @@ deactivated by setting this parameter to 0, giving priority to the tiny edge or
 removal.
 
   - <b>use deprecated patch mesher</b> - This option reproduces the mesher behaviour of previous MG-CADSurf versions
-(MeshGems 2.1-11 and older, before SALOME 8.2). This has proved useful on some particular cases such as very small 
+(MeshGems before 2.3, i.e. before SALOME 8.2). This has proved useful on some particular cases such as very small 
 local size on a vertex situated on a border curve.
 
 - <b>CAD preprocessor</b> options. The CAD preprocessor (formerly known as PreCAD) has two main goals:
@@ -264,7 +264,10 @@ interpolate two values, a linear interpolation is used by default, but
 this can be modified by \ref blsurf_hinterpol_flag "hinterpol flag". 
 
 <b>Note:</b> on some particular configurations, the mesher behaviour is
-not the same as before (SALOME versions before 8.2). See "use deprecated patch mesher"
+not the same as before (SALOME versions before 8.2 i.e. MeshGems before 2.3).
+For a small local size defined on a point situated on a border curve,
+the previous mesher behaviour may be prefered: 
+see "use deprecated patch mesher"
 on advanced tag.