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/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=5482b99d07dd144fd5be299e722f39a81de3b5be;hp=971a1433b37f071c05729600d2d64bbb44616734

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33efb9f10..312c48e84 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 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 1)
diff --git a/doc/salome/gui/SMESH/images/quad_from_ma_mesh.png b/doc/salome/gui/SMESH/images/quad_from_ma_mesh.png
index 3e3c63b23..f233cc640 100644
Binary files a/doc/salome/gui/SMESH/images/quad_from_ma_mesh.png and b/doc/salome/gui/SMESH/images/quad_from_ma_mesh.png differ