Merge V8_3_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0b7e84d8137e83d220b8d85718f7dae03f498f2..3d6a311ec9a3148ffdebe851149f985998998c9e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,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/en/conf.py.in b/doc/en/conf.py.in
index 01efc5341c2f0c09986124763ebe63ec56f9f33d..e6d71de817b9608eb035ea370349ab193ec3eafd 100644 (file)
--- a/doc/en/conf.py.in
+++ b/doc/en/conf.py.in
@@ -38,7 +38,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'HOMARD'
-copyright = u'1996, 2011, 2016, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret'
+copyright = u'1996, 2011, 2017, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/doc/files/licence.en.txt b/doc/files/licence.en.txt
index 131bc22bee99d7680a149de3231595143cced9dd..edd23edda2f70443d7dc4de4199768b908fe0118 100644 (file)
--- a/doc/files/licence.en.txt
+++ b/doc/files/licence.en.txt
@@ -1,6 +1,6 @@
     <HOMARD, a SALOME module for Mesh Adaptation>
 
-    Copyright (C) 1996, 2016 EDF
+    Copyright (C) 1996, 2017 EDF
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public

diff --git a/doc/files/licence.fr.txt b/doc/files/licence.fr.txt
index 131bc22bee99d7680a149de3231595143cced9dd..edd23edda2f70443d7dc4de4199768b908fe0118 100644 (file)
--- a/doc/files/licence.fr.txt
+++ b/doc/files/licence.fr.txt
@@ -1,6 +1,6 @@
     <HOMARD, a SALOME module for Mesh Adaptation>
 
-    Copyright (C) 1996, 2016 EDF
+    Copyright (C) 1996, 2017 EDF
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public

diff --git a/doc/fr/conf.py.in b/doc/fr/conf.py.in
index 5df8aefb6e96aab1089fdb23f4a3049540bbd59d..a0cb621e0ec4dcca2fea11d063d5901724299e96 100644 (file)
--- a/doc/fr/conf.py.in
+++ b/doc/fr/conf.py.in
@@ -38,7 +38,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'HOMARD'
-copyright = u'1996, 2011, 2016, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret'
+copyright = u'1996, 2011, 2017, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the