From: vsr <vsr@opencascade.com>
Date: Fri, 6 Dec 2019 13:47:57 +0000 (+0300)
Subject: Merge branch 'V9_4_BR'
X-Git-Tag: EMC2P_V_1_2_0~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=96630170487776c4b5129810da35196d8ce04f6e;hp=-c;p=modules%2Fkernel.git

Merge branch 'V9_4_BR'
---

96630170487776c4b5129810da35196d8ce04f6e
diff --combined CMakeLists.txt
index 05c6d7f62,2e4681f6e..4ee56481e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -30,11 -30,11 +30,11 @@@ CMAKE_POLICY(SET CMP0003 NEW
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
  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
  # ===================