Merge V8_3_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 991a75550a63919b227681b26ea315c8231d4d09..02c7100aee683eb7325be68d6764624034ccfee4 100755 (executable)
--- 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 071243694c07b2380f5ab4ee3182c3e84ea963e9..8bffbc9706bf240142af18c547070bde775d746e 100644 (file)
--- 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