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

Merge V8_3_BR branch.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 991a755..02c7100 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 0712436..8bffbc9 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -39,7 +39,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'jobmanager'
-copyright = '2010-2016 CEA/DEN, EDF R&D, A. Ribes'
+copyright = '2010-2017 CEA/DEN, EDF R&D, A. Ribes'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the