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

Merge branch V7_6_BR
---

0cbac893df41e4ca8d94d13fa9268379ed150857
diff --cc CMakeLists.txt
index cd3e94139,ab2e7838e..0d198198a
--- 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)
  
  # Our own set of macros:
  LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/salome_adm/cmake_files")