From: asl <asl@opencascade.com>
Date: Thu, 25 Jun 2015 07:26:04 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc
X-Git-Tag: v1.4.2~34
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c0d628b2e1f42a693a91c1054f42dcfd36a054e5;p=modules%2Fhydro.git

Merge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc

Conflicts:
	src/HYDROGUI/HYDROGUI_Operations.cxx
---

c0d628b2e1f42a693a91c1054f42dcfd36a054e5
diff --cc src/HYDROGUI/HYDROGUI_Operations.cxx
index ad34f778,62707523..8858974a
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@@ -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>