From: rnv <rnv@opencascade.com>
Date: Fri, 28 Apr 2017 13:31:04 +0000 (+0300)
Subject: Merge V8_3_BR branch.
X-Git-Tag: Before_multi_study_removal_06072017
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b51fffbb3584890f5757c74e277788a1fbf3b798;p=plugins%2Fhybridplugin.git

Merge V8_3_BR branch.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ed43c7..ba55217 100755
--- 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/HYBRIDPLUGIN/static/footer.html b/doc/salome/gui/HYBRIDPLUGIN/static/footer.html
index de6db6a..b52879b 100755
--- a/doc/salome/gui/HYBRIDPLUGIN/static/footer.html
+++ b/doc/salome/gui/HYBRIDPLUGIN/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>