From 237be572d71946032b4afabacd5952a96e906fab Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Fri, 28 Apr 2017 16:27:19 +0300
Subject: [PATCH] Merge V8_3_BR branch.

---
 CMakeLists.txt           | 2 +-
 doc/en/conf.py.in        | 2 +-
 doc/files/licence.en.txt | 2 +-
 doc/files/licence.fr.txt | 2 +-
 doc/fr/conf.py.in        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0b7e84d..3d6a311e 100755
--- 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 01efc534..e6d71de8 100644
--- 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 131bc22b..edd23edd 100644
--- 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 131bc22b..edd23edd 100644
--- 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 5df8aefb..a0cb621e 100644
--- 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
-- 
2.39.2