From e2faff1d724922e34c3e8613906380ac5e3fbd7d Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Tue, 11 Jul 2017 17:30:26 +0200 Subject: [PATCH 1/1] change version number --- CMakeLists.txt | 4 ++-- doc/salome/tutorial/conf.py.in | 2 +- doc/salome/tutorial/english/conf.py.in | 2 +- src/HYDROGUI/resources/LightApp.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 176582e0..ea854275 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ CMAKE_POLICY(SET CMP0003 NEW) # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 1) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 5) +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 2) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 0) 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}) diff --git a/doc/salome/tutorial/conf.py.in b/doc/salome/tutorial/conf.py.in index 0ed919c5..bc2952fe 100644 --- a/doc/salome/tutorial/conf.py.in +++ b/doc/salome/tutorial/conf.py.in @@ -68,7 +68,7 @@ copyright = u'2015-2017, EDF' version = '8.3.0' # The full version, including alpha/beta/rc tags. #release = '@SALOMEHYDRO_VERSION@' -release = '8.3.0- module HYDRO -2.0-2017.05.21' +release = '8.3.0- module HYDRO -@SALOMEHYDRO_VERSION@-2017.07.10' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/salome/tutorial/english/conf.py.in b/doc/salome/tutorial/english/conf.py.in index 15fab4d9..106c9b91 100644 --- a/doc/salome/tutorial/english/conf.py.in +++ b/doc/salome/tutorial/english/conf.py.in @@ -68,7 +68,7 @@ copyright = u'2015-2017, EDF' version = '8.3.0' # The full version, including alpha/beta/rc tags. #release = '@SALOMEHYDRO_VERSION@' -release = '8.3.0- module HYDRO -2.0-2017.04.27' +release = '8.3.0- module HYDRO -@SALOMEHYDRO_VERSION@-2017.07.10' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/HYDROGUI/resources/LightApp.xml b/src/HYDROGUI/resources/LightApp.xml index ab879c8b..4189d413 100644 --- a/src/HYDROGUI/resources/LightApp.xml +++ b/src/HYDROGUI/resources/LightApp.xml @@ -27,7 +27,7 @@ - + -- 2.39.2