From: vsr <vsr@opencascade.com>
Date: Thu, 3 Apr 2014 09:00:28 +0000 (+0400)
Subject: Merge branch V7_3_1_BR
X-Git-Tag: V7_4_0a1^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d4617a5edb41e7acd4025a2b56160ae267ede7f6;p=modules%2Fkernel.git

Merge branch V7_3_1_BR
---

d4617a5edb41e7acd4025a2b56160ae267ede7f6
diff --cc CMakeLists.txt
index 6e649bc6d,77c364227..bb1b84bc1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,10 -31,10 +31,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
  SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
  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")