From: vsr <vsr@opencascade.com>
Date: Thu, 31 May 2018 15:39:26 +0000 (+0300)
Subject: Merge branch 'V8_5_BR'
X-Git-Tag: SHAPER_V9_1_0RC1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bd8d3db25df03483b7610980e80734f785391d0a;hp=-c;p=plugins%2Fghs3dplugin.git

Merge branch 'V8_5_BR'
---

bd8d3db25df03483b7610980e80734f785391d0a
diff --combined CMakeLists.txt
index 02271ec,8e5bc11..88873b4
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,11 -31,11 +31,11 @@@ ENDIF(WIN32
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
- 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
  # ===================