Merge branch 'gni/evolution' into V9_7_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b322f2b40a6b65a1655099941dfc96e39133a5e0..f9e93d6abfa6fd2eb4e06603f48e52967550c8f9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,11 +27,11 @@ INCLUDE(CMakeDependentOption)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
 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 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Common CMake macros
 # ===================

diff --git a/src/Tools/blocFissure/doc/pipes.rst b/src/Tools/blocFissure/doc/pipes.rst
index 2101f546a3ccee55f33ca77390572ce4967ed3b6..386e418429cb8bc7d1f0af8ea8b9b7e4eb401661 100644 (file)
--- a/src/Tools/blocFissure/doc/pipes.rst
+++ b/src/Tools/blocFissure/doc/pipes.rst
@@ -11,7 +11,7 @@ Cracked bended pipes being a common encountered case, a specific module was deve
    :align: center\r
    :alt: Print screen of GUI\r
 \r
-   Print screen of GUI of the extension *Meshed Pipe with a crack*\r
+Print screen of GUI of the extension *Meshed Pipe with a crack*\r
 \r
 The GUI is a window with mandatory and optional parameters. Optional parameters have to be activated by ticking the corresponding check box. Parameters are explained on the following figures and table. Angles are in degrees and lengths dimensions are all the same and shall then be consistent with each other’s.\r
 \r