From: vsr <vsr@opencascade.com>
Date: Thu, 3 Apr 2014 11:47:59 +0000 (+0400)
Subject: Merge branch V7_3_1_BR
X-Git-Tag: V7_4_0b1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aa9d5def5fcf59c51bb2abb9578f18564001cbff;p=plugins%2Fhybridplugin.git

Merge branch V7_3_1_BR
---

fab8a31fababdccca44f0f1b4a74115558bcf6c1
diff --cc CMakeLists.txt
index f12b287,c773f21..d09c4cd
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -29,10 -29,10 +29,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)
  
  # Find KERNEL
  # ===========