From: vsr <vsr@opencascade.com>
Date: Wed, 3 Jun 2015 06:50:37 +0000 (+0300)
Subject: Merge branch V7_6_BR
X-Git-Tag: V7_7_0a1~43
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ee2a935cbc626294e620f467a24bbc6c21d1b1c7;p=modules%2Fgui.git

Merge branch V7_6_BR
---

ee2a935cbc626294e620f467a24bbc6c21d1b1c7
diff --cc CMakeLists.txt
index 5eb8ac30d,b8e9136ef..0bab82439
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -30,11 -30,11 +30,11 @@@ CMAKE_POLICY(SET CMP0003 NEW
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 6)
+ 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)
  
  # Find KERNEL
  # ===========