Merge branch 'V9_8_BR'

diff --cc CMakeLists.txt
index 2f4705da4a45398b6c82d6fb417b2ab9c3642ac8,0e537144475e58b55f2b560e3ce9476eea7c4a1a..ddcef2ba0369fc698c7aa9291bf71fa0a4625e75
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -38,7 -38,7 +38,7 @@@ ENDIF(
  
  # Versioning
  # ===========
- SALOME_SETUP_VERSION(9.7.0 DEVELOPMENT)
 -SALOME_SETUP_VERSION(9.8.0)
++SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
  MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
  
  # Find KERNEL

diff --cc src/StdMeshers/StdMeshers_Cartesian_3D.cxx
Simple merge