]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION
authormzn <mzn@opencascade.com>
Mon, 25 May 2015 07:49:31 +0000 (10:49 +0300)
committermzn <mzn@opencascade.com>
Mon, 25 May 2015 07:49:31 +0000 (10:49 +0300)
1  2 
src/HYDROGUI/CMakeLists.txt
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h
src/HYDROGUI/resources/HYDROGUI_msg_en.ts

Simple merge
Simple merge
index b9f8ab9fe161b5b61fb2dbda171bce22486c2d56,3eeebc14ffb196a0277b014880f074cb96bfc1a0..e040afc8c6b2fede747cd8e0355d758b0d9a769b
@@@ -107,8 -107,10 +107,11 @@@ enum OperationI
    RiverBottomContextId,
    ProfileInterpolateId,
  
 +  RecognizeContoursId
    SubmersibleId,
+   ImportPolylineId,
+   ExportPolylineId
  };
  
  #endif