Salome HOME
Merge branch 'Dev_1.5.0' into BR_REENTRANCE_OPERATION
authornds <nds@opencascade.com>
Tue, 3 Nov 2015 05:49:59 +0000 (08:49 +0300)
committernds <nds@opencascade.com>
Tue, 3 Nov 2015 05:49:59 +0000 (08:49 +0300)
commitf34fba2433c87ccdf824df0dc8c34099054b1715
tree061acc654b7139def0bb2ab5fa6ced25dfdf816b
parenta7c7560bde33353019f45030709ed2a85823afe7
parentc904671c129d53e4729ec9b38cd9b48ca5a1aebe
Merge branch 'Dev_1.5.0' into BR_REENTRANCE_OPERATION

Conflicts:
src/XGUI/XGUI_PropertyPanel.cpp
src/ModuleBase/ModuleBase_IModule.h
src/ModuleBase/ModuleBase_OperationFeature.cpp
src/ModuleBase/ModuleBase_WidgetSelector.cpp
src/PartSet/CMakeLists.txt
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h
src/PartSet/PartSet_SketcherMgr.cpp
src/PartSet/PartSet_WidgetPoint2d.cpp
src/PartSet/PartSet_WidgetPoint2d.h
src/XGUI/XGUI_PropertyPanel.cpp
src/XGUI/XGUI_Workshop.cpp