From: rnv <rnv@opencascade.com>
Date: Tue, 30 May 2017 12:43:04 +0000 (+0300)
Subject: Merge V8_3_BR branch.
X-Git-Tag: Before_multi_study_removal_06072017~2
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=651e7566c8d9c267c71320c63d3742a92426aa3e;hp=-c

Merge V8_3_BR branch.
---

651e7566c8d9c267c71320c63d3742a92426aa3e
diff --combined CMakeLists.txt
index a2d069f66,ef42ec11a..b3e766d8d
--- 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 2)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
  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
  # ===================