From: mzn <mzn@opencascade.com>
Date: Mon, 25 May 2015 07:49:31 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION
X-Git-Tag: v1.4.1~7^2~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ed7a9d24abef6457c7eb94db703c57b0406df3d6;p=modules%2Fhydro.git

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

ed7a9d24abef6457c7eb94db703c57b0406df3d6
diff --cc src/HYDROGUI/HYDROGUI_Operations.h
index b9f8ab9f,3eeebc14..e040afc8
--- a/src/HYDROGUI/HYDROGUI_Operations.h
+++ b/src/HYDROGUI/HYDROGUI_Operations.h
@@@ -107,8 -107,10 +107,11 @@@ enum OperationI
    RiverBottomContextId,
    ProfileInterpolateId,
  
 +  RecognizeContoursId
    SubmersibleId,
+   ImportPolylineId,
+   ExportPolylineId
+ 
  };
  
  #endif