From: isn <isn@opencascade.com>
Date: Mon, 8 Jun 2015 12:01:25 +0000 (+0300)
Subject: Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.4.1~6^2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e0ed73f9fe23d646ae3b99ee4446098f10f3cb55;p=modules%2Fhydro.git

Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER
---

e0ed73f9fe23d646ae3b99ee4446098f10f3cb55
diff --cc src/HYDROGUI/CMakeLists.txt
index 5d82fe65,b06c6908..684e5634
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@@ -23,10 -23,11 +23,12 @@@ set(PROJECT_HEADER
      HYDROGUI_DigueDlg.h
      HYDROGUI_DigueOp.h
      HYDROGUI_Displayer.h
+     HYDROGUI_DuplicateOp.h
      HYDROGUI_ExportImageOp.h
 +    HYDROGUI_ExportFileOp.h
      HYDROGUI_GVSelector.h
      HYDROGUI_ImagePrs.h
+ 	HYDROGUI_BasicZoneDlg.h
      HYDROGUI_ImmersibleZoneDlg.h
      HYDROGUI_ImmersibleZoneOp.h
      HYDROGUI_ImportBathymetryDlg.h
@@@ -137,10 -143,11 +144,12 @@@ set(PROJECT_SOURCE
      HYDROGUI_DigueDlg.cxx
      HYDROGUI_DigueOp.cxx
      HYDROGUI_Displayer.cxx
+     HYDROGUI_DuplicateOp.cxx
      HYDROGUI_ExportImageOp.cxx
 +    HYDROGUI_ExportFileOp.cxx
      HYDROGUI_GVSelector.cxx
      HYDROGUI_ImagePrs.cxx
+ 	HYDROGUI_BasicZoneDlg.cxx
      HYDROGUI_ImmersibleZoneDlg.cxx
      HYDROGUI_ImmersibleZoneOp.cxx
      HYDROGUI_ImportBathymetryDlg.cxx