From: isn <isn@opencascade.com>
Date: Thu, 18 Jun 2015 11:13:41 +0000 (+0300)
Subject: Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
X-Git-Tag: v1.4.2~54^2~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=df3470544e7f6ee312e7c2967b965ab4227f56e5;p=modules%2Fhydro.git

Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT

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

df3470544e7f6ee312e7c2967b965ab4227f56e5
diff --cc src/HYDROGUI/HYDROGUI_Operations.cxx
index aad39a09,74eb0a8e..44d0636e
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@@ -63,7 -62,8 +63,9 @@@
  #include "HYDROGUI_StricklerTableOp.h"
  #include "HYDROGUI_DuplicateOp.h"
  #include "HYDROGUI_LandCoverOp.h"
 +#include "HYDROGUI_ExportSinusXOp.h"
+ #include "HYDROGUI_MergePolylinesOp.h"
+ #include "HYDROGUI_SplitPolylinesOp.h"
  
  #include <HYDROData_Document.h>
  #include <HYDROData_Obstacle.h>