Merge V8_3_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d6732c8d0a9ab14c3bb057d2ce1bee9d8f9fbc8..0a85df880a1a1037b594700779674a12dd242440 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 54492a14f0e022c0ac9a3682e3f8c5bef0aab717..59c94551eb6b43e4d89ccb2ffa68ba5ad9087cbb 100644 (file)
--- 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