Merge V8_3_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acdab6650a9f85b3c89aab129cd2d4c7fe607529..4f748ccc185758866e97af4b7c9eba9c374a774c 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/salome/gui/HexoticPLUGIN/static/footer.html b/doc/salome/gui/HexoticPLUGIN/static/footer.html
index de6db6a6c6d55ea90befc28cce87b52271f01395..b52879b324cd1a20463b652cf748696954337439 100755 (executable)
--- a/doc/salome/gui/HexoticPLUGIN/static/footer.html
+++ b/doc/salome/gui/HexoticPLUGIN/static/footer.html
@@ -4,7 +4,7 @@
   <ul>
     $navpath
     <li class="footer">
-      Copyright &copy; 2007-2016  CEA/DEN, EDF R&amp;D<br>
+      Copyright &copy; 2007-2017  CEA/DEN, EDF R&amp;D<br>
     </li>
   </ul>
 </div>