]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Merge remote-tracking branch 'origin/BR_IMPROVEMENTS' into BR_v14_rc
authorasl <asl@opencascade.com>
Mon, 25 May 2015 05:14:26 +0000 (08:14 +0300)
committerasl <asl@opencascade.com>
Mon, 25 May 2015 05:14:26 +0000 (08:14 +0300)
Conflicts:
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h

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 5362e538f98e083068eb0f46b35934043ad0e722,1d61da4577de97bfa6d2c0884c753d013e0e9633..3eeebc14ffb196a0277b014880f074cb96bfc1a0
@@@ -107,7 -111,9 +107,10 @@@ enum OperationI
    RiverBottomContextId,
    ProfileInterpolateId,
  
 +  SubmersibleId,
+   ImportPolylineId,
+   ExportPolylineId
  };
  
  #endif