]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge remote-tracking branch 'origin/BR_REENTRANCE_OPERATION' into origin_Dev_1.5.0
authornds <nds@opencascade.com>
Mon, 9 Nov 2015 11:34:57 +0000 (14:34 +0300)
committernds <nds@opencascade.com>
Mon, 9 Nov 2015 11:34:57 +0000 (14:34 +0300)
commit42985955d89fa845790a7e38609f5b6838285147
tree0854d1ce6ffdcbcdfef16183a6c6749e85d14147
parentef7a793f109f7507b0f48e12bf72d943c5d22487
parent7ac62ed656e4a6593ff8a314c715eeefe3a81bb6
Merge remote-tracking branch 'origin/BR_REENTRANCE_OPERATION' into origin_Dev_1.5.0

Conflicts:
src/Model/Model_Document.cpp
13 files changed:
src/Model/Model_Document.cpp
src/ModuleBase/ModuleBase_OperationFeature.cpp
src/ModuleBase/ModuleBase_OperationFeature.h
src/ModuleBase/ModuleBase_WidgetSelector.cpp
src/PartSet/CMakeLists.txt
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h
src/PartSet/PartSet_SketcherMgr.h
src/PartSet/PartSet_Validators.cpp
src/PartSet/PartSet_WidgetPoint2d.cpp
src/PartSet/PartSet_WidgetPoint2d.h
src/XGUI/XGUI_PropertyPanel.cpp
src/XGUI/XGUI_Workshop.cpp