]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into...
authorisn <isn@opencascade.com>
Mon, 8 Jun 2015 12:01:25 +0000 (15:01 +0300)
committerisn <isn@opencascade.com>
Mon, 8 Jun 2015 12:01:25 +0000 (15:01 +0300)
1  2 
src/HYDROData/CMakeLists.txt
src/HYDROGUI/CMakeLists.txt
src/HYDROGUI/HYDROGUI_Module.cxx
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/resources/HYDROGUI_images.ts
src/HYDROGUI/resources/HYDROGUI_msg_en.ts

Simple merge
index 5d82fe650fd3440f5540a113cb38bbbbf3285920,b06c690810cd993cafb0e351ca1c516878954205..684e5634e628121f82ed146c86e44f22468b3924
@@@ -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
Simple merge
Simple merge