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

Merge branch 'V9_6_BR'
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dedc518..755e551 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ PROJECT(SalomeCALCULATOR 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})