From: vsr <vsr@opencascade.com>
Date: Fri, 10 Dec 2021 09:35:41 +0000 (+0300)
Subject: Merge branch 'V9_8_BR'
X-Git-Tag: EMC2P_V_1_3_5-rc1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8e988f5d89cb22a39a19ba97459fba2e9c682cee;p=modules%2Fkernel.git

Merge branch 'V9_8_BR'
---

8e988f5d89cb22a39a19ba97459fba2e9c682cee
diff --cc CMakeLists.txt
index 2b4c73681,3ff303044..e7b238f57
--- a/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}\"")
  
  # Platform setup