From: Paul RASCLE <paul.rascle@edf.fr>
Date: Mon, 20 May 2019 09:22:30 +0000 (+0200)
Subject: Merge branch 'BR_H2018_2' into pre/V9_3_BR_HYDRO
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fpre%2FV9_3_BR_HYDRO;p=modules%2Fgeom.git

Merge branch 'BR_H2018_2' into pre/V9_3_BR_HYDRO
---

ecfaadb04d8cc3852999098d9f5b5ad4ddea53dc
diff --cc resources/CMakeLists.txt
index 2510cb0fc,ff1e39d94..c3ee77628
mode 100644,100755..100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
diff --cc src/GEOMGUI/GEOM_msg_en.ts
index e1010522b,87e293afc..87e293afc
mode 100644,100755..100644
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts