]> SALOME platform Git repositories - modules/hexablock.git/commitdiff
Salome HOME
Merge branch V7_3_1_BR V7_4_0a1 V7_4_0b1
authorvsr <vsr@opencascade.com>
Thu, 3 Apr 2014 12:38:29 +0000 (16:38 +0400)
committervsr <vsr@opencascade.com>
Thu, 3 Apr 2014 12:38:29 +0000 (16:38 +0400)
1  2 
CMakeLists.txt
src/HEXABLOCKGUI/HEXABLOCKGUI.cxx

diff --cc CMakeLists.txt
index b0d6afb96bb09b14e87c450a01e06e202b689ed4,847ba193e3427fed66d14aec6172a969e669707f..3fe5cbceb49fc39d7beced7dbffc1077ddb5a094
@@@ -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
  # ===========
Simple merge