From: rnv <rnv@opencascade.com>
Date: Fri, 28 Apr 2017 13:27:44 +0000 (+0300)
Subject: Merge V8_3_BR branch.
X-Git-Tag: Before_multi_study_removal_06072017
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1503375cc8ad22a6480227487bbc9647b3b8f13d;p=modules%2Fhexablock.git

Merge V8_3_BR branch.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d6732c..0a85df8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,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
 # ===================
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 54492a1..59c9455 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -49,7 +49,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'HexaBlock'
-copyright = u'2009-2016  CEA/DEN, EDF R&D'
+copyright = u'2009-2017  CEA/DEN, EDF R&D'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the