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

Merge branch 'V9_4_BR'
---

b311e0ddf72a9f9e10caec549428425f41e1fc14
diff --combined CMakeLists.txt
index 147ce7f9d,df0be0a9c..10fb7d492
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -33,11 -33,11 +33,11 @@@ ENDIF(WIN32
  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
  # ===================