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

Merge branch 'V9_6_BR'
---

57baaec8de38004993adf0e83cb23216cf8b0c1f
diff --combined CMakeLists.txt
index 32f82d8,0b9b66c..431e617
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,11 -25,11 +25,11 @@@ PROJECT(SalomePYCALCULATOR C CXX
  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
  # ===================