From: vsr Date: Tue, 5 Mar 2019 07:01:28 +0000 (+0300) Subject: Merge branch 'V9_2_2_BR' X-Git-Tag: V9_3_0a2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=752f64319a1458b87ee8abd6d3c189664930402d;p=tools%2Fdocumentation.git Merge branch 'V9_2_2_BR' --- b65870e1f9a75d1adebad0c28d6fcdef7bff6366 diff --cc CMakeLists.txt index d187b9d,a0e6664..2e1cd9c --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -28,10 -28,10 +28,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_ SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) - SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) + SET(${PROJECT_NAME_UC}_PATCH_VERSION 2) 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 # ===================