From: vsr <vsr@opencascade.com>
Date: Fri, 10 Jul 2020 15:38:32 +0000 (+0300)
Subject: Merge branch 'V9_5_BR'
X-Git-Tag: V9_6_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?p=samples%2Fpyhello.git;a=commitdiff_plain;h=4b9506866d1abe774c48bb6d584aeb68a62479e1;hp=-c

Merge branch 'V9_5_BR'
---

4b9506866d1abe774c48bb6d584aeb68a62479e1
diff --combined CMakeLists.txt
index 7be67b0,9de7d11..6f26e80
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,11 -25,11 +25,11 @@@ PROJECT(SalomePYHELLO C CXX
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
  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
  # ===================