Merge branch 'V9_9_BR'

diff --cc CMakeLists.txt
index f9f60ac1ecc76919d4b4ffbe7c60b48886c730ee,9cb4179ec950d11f5ed2377298f5964b34c76407..6154d45d9c92a43037ff4cb74f1848ddeebefcec
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -50,7 -50,7 +50,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} ${${PROJECT_NAME}_VERSION} from \"${${PROJECT_NAME}_GIT_SHA1}\"")
  SET(COMPONENT_NAME SHAPER)
  

diff --cc src/PythonAddons/macros/pipeNetwork/feature.py
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_Fillet.cpp
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_Validators.cpp
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_Validators.h
Simple merge