From: vsr <vsr@opencascade.com>
Date: Wed, 11 Nov 2020 15:57:11 +0000 (+0300)
Subject: Merge branch 'V9_6_BR'
X-Git-Tag: V9_7_0a1~48^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=c835e6ad6d8c2567bc40bdf242bf2110c1fe8648;hp=-c

Merge branch 'V9_6_BR'
---

c835e6ad6d8c2567bc40bdf242bf2110c1fe8648
diff --combined CMakeLists.txt
index 6e6839abd,2cda1b74c..adfdf638c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -27,11 -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 5)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
  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 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Common CMake macros
  # ===================