From: rnv <rnv@opencascade.com>
Date: Tue, 30 May 2017 08:21:05 +0000 (+0300)
Subject: Merge V8_3_BR & rnv/win_swig_generation branches
X-Git-Tag: Before_multi_study_removal_06072017~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0638e8ec112c3ce0730554ddf570fce766b297d0;p=modules%2Fgeom.git

Merge V8_3_BR & rnv/win_swig_generation branches
---

0638e8ec112c3ce0730554ddf570fce766b297d0
diff --cc CMakeLists.txt
index c85cb8fad,c85cb8fad..00cd53e15
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -37,7 -37,7 +37,7 @@@ 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
  # ===================