]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Merge branch 'V9_2_2_BR'
authorvsr <vsr@opencascade.com>
Tue, 5 Mar 2019 06:45:33 +0000 (09:45 +0300)
committervsr <vsr@opencascade.com>
Tue, 5 Mar 2019 06:45:33 +0000 (09:45 +0300)
1  2 
CMakeLists.txt
src/LightApp/LightApp_Application.h

diff --cc CMakeLists.txt
index 1e5e3ded15388c9e0e5cc3585ab223fac66d588e,4ad5691bdbe491b9750bfe152699fa6df03d1992..d48258a4e8747406618f255a2560e75769cbd519
mode 100644,100755..100644
@@@ -34,10 -34,10 +34,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
  # ===================
Simple merge