From: Paul RASCLE <paul.rascle@edf.fr>
Date: Tue, 16 Feb 2016 17:52:15 +0000 (+0100)
Subject: Merge branch 'hydro/imps_2015' into V7_dev
X-Git-Tag: V7_8_0a2~25
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5482b99d07dd144fd5be299e722f39a81de3b5be;p=modules%2Fsmesh.git

Merge branch 'hydro/imps_2015' into V7_dev
---

5482b99d07dd144fd5be299e722f39a81de3b5be
diff --cc CMakeLists.txt
index 33efb9f10,08f747133..312c48e84
--- 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 7)
- 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
  # ===========