Merge branch 'V9_9_BR'

diff --cc CMakeLists.txt
index 6d3fce22dff68411d2de131bcb6961e357bae69f,42a88836c92e909b3aca71ffb7219c1d9a759d70..347663a06e03e8434507abf600e7ad09bebb50bc
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -38,7 -38,7 +38,7 @@@ ENDIF(
  
  # Versioning
  # ===========
- SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
 -SALOME_SETUP_VERSION(9.9.0)
++SALOME_SETUP_VERSION(9.9.0 DEVELOPMENT)
  MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
  
  # Platform setup

diff --cc SalomeKERNELConfig.cmake.in
Simple merge