]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc
authorasl <asl@opencascade.com>
Thu, 25 Jun 2015 07:26:04 +0000 (10:26 +0300)
committerasl <asl@opencascade.com>
Thu, 25 Jun 2015 07:26:04 +0000 (10:26 +0300)
Conflicts:
src/HYDROGUI/HYDROGUI_Operations.cxx

1  2 
src/HYDROGUI/CMakeLists.txt
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h
src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
src/HYDROGUI/resources/HYDROGUI_msg_en.ts

Simple merge
index ad34f778a3fed7121b7017a1218ef59bc1e24e0f,62707523e5f94e25ba8f0cf9ee0c199eca1fb4d6..8858974a1039c9aea1daf4309bf7485828750096
@@@ -66,7 -66,7 +66,8 @@@
  #include "HYDROGUI_ExportSinusXOp.h"
  #include "HYDROGUI_MergePolylinesOp.h"
  #include "HYDROGUI_SplitPolylinesOp.h"
 +#include "HYDROGUI_LandCoverColoringOp.h"
+ #include "HYDROGUI_ImportLandCoverOp.h"
  
  #include <HYDROData_Document.h>
  #include <HYDROData_Obstacle.h>
Simple merge