From: vsr <vsr@opencascade.com>
Date: Tue, 5 Mar 2019 06:45:33 +0000 (+0300)
Subject: Merge branch 'V9_2_2_BR'
X-Git-Tag: V9_3_0a2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fd22340460025ea5a2b068a75787c8666324238b;p=modules%2Fgui.git

Merge branch 'V9_2_2_BR'
---

fd22340460025ea5a2b068a75787c8666324238b
diff --cc CMakeLists.txt
index 1e5e3ded1,4ad5691bd..d48258a4e
mode 100644,100755..100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -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
  # ===================