From b51fffbb3584890f5757c74e277788a1fbf3b798 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 28 Apr 2017 16:31:04 +0300 Subject: [PATCH 1/1] Merge V8_3_BR branch. --- CMakeLists.txt | 2 +- doc/salome/gui/HYBRIDPLUGIN/static/footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 @@ -- 2.30.2