Salome HOME
Merge branch 'Dev_2.8.0'
authornds <nds@opencascade.com>
Wed, 4 Oct 2017 04:39:24 +0000 (07:39 +0300)
committernds <nds@opencascade.com>
Wed, 4 Oct 2017 04:39:24 +0000 (07:39 +0300)
commit08f1aef6629e6a63cc4671d271ded4de6e826948
treedc9a95089b4462103b88330f88144bd9a4043df7
parent7d8e6f55033caf061146ea3838aac9607bda1c27
parent14267597489dfc7526b79baba085d097eb8ae451
Merge branch 'Dev_2.8.0'

Conflicts:
src/XGUI/XGUI_DataModel.h
src/XGUI/XGUI_OperationMgr.cpp
13 files changed:
CMakeLists.txt
src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp
src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
src/Model/Model_AttributeSelection.cpp
src/ModuleBase/ModuleBase_ModelWidget.cpp
src/ModuleBase/ModuleBase_ModelWidget.h
src/ModuleBase/ModuleBase_WidgetEditor.cpp
src/ModuleBase/ModuleBase_WidgetEditor.h
src/XGUI/XGUI_DataModel.cpp
src/XGUI/XGUI_DataModel.h
src/XGUI/XGUI_MenuMgr.cpp
src/XGUI/XGUI_OperationMgr.cpp
src/XGUI/XGUI_OperationMgr.h