From: vsr <vsr@opencascade.com>
Date: Tue, 5 Mar 2019 07:19:04 +0000 (+0300)
Subject: Merge branch 'V9_2_2_BR'
X-Git-Tag: V9_3_0a2^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ce53b828d6dc3c693871922e2de747646a3ec2e7;p=samples%2Fpycalculator.git

Merge branch 'V9_2_2_BR'
---

ce53b828d6dc3c693871922e2de747646a3ec2e7
diff --cc CMakeLists.txt
index 6efdff5,f2b3237..39703f1
mode 100644,100755..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -29,10 -29,10 +29,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
  SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION 2)
  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
  # ===================