From: asl <asl@opencascade.com>
Date: Mon, 25 May 2015 05:14:26 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_IMPROVEMENTS' into BR_v14_rc
X-Git-Tag: v1.4.1~21
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f0688b4c39fcc3e49c2b58a90724b9c1c84f1337;p=modules%2Fhydro.git

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

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

f0688b4c39fcc3e49c2b58a90724b9c1c84f1337
diff --cc src/HYDROGUI/HYDROGUI_Operations.h
index 5362e538,1d61da45..3eeebc14
--- a/src/HYDROGUI/HYDROGUI_Operations.h
+++ b/src/HYDROGUI/HYDROGUI_Operations.h
@@@ -107,7 -111,9 +107,10 @@@ enum OperationI
    RiverBottomContextId,
    ProfileInterpolateId,
  
 +  SubmersibleId,
+   ImportPolylineId,
+   ExportPolylineId
+ 
  };
  
  #endif