From: vsr <vsr@opencascade.com>
Date: Fri, 10 Jul 2020 15:14:29 +0000 (+0300)
Subject: Merge branch 'V9_5_BR'
X-Git-Tag: V9_6_0a1~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=11cbc17d51c4ea7226b75d501ea7d5ca2a1e1480;p=modules%2Fgeom.git

Merge branch 'V9_5_BR'
---

11cbc17d51c4ea7226b75d501ea7d5ca2a1e1480
diff --cc CMakeLists.txt
index 0fd0bf212,0fd0bf212..03980253f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,7 -31,7 +31,7 @@@ 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
  # ===================