From: vsr <vsr@opencascade.com>
Date: Thu, 3 Apr 2014 11:06:33 +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=9417feb74e73698b9e10c557b3e3c463637a56a6;p=modules%2Fmed.git

Merge branch V7_3_1_BR
---

9417feb74e73698b9e10c557b3e3c463637a56a6
diff --cc CMakeLists.txt
index 7f12b2bb5,0934032de..32ded1a5c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,10 -30,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)
  
  #
  # Kernel detection comes before user options to be