From: vsr Date: Thu, 28 Aug 2014 09:39:33 +0000 (+0400) Subject: Merge remote branch 'origin/V7_4_BR' X-Git-Tag: V7_5_0a1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=97d7c38edc8a63a77c41ef28c5d39bd197bda0d8;hp=3891dcdeed46af0c1195a07b381783d85a66becd;p=samples%2Fpyhello.git Merge remote branch 'origin/V7_4_BR' --- diff --git a/CMakeLists.txt b/CMakeLists.txt index fde2f32..6d11cb6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) -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)