Salome HOME
Merge branch 'Dev_GroupsRevision'
authorvsv <vsv@opencascade.com>
Mon, 25 Dec 2017 14:42:02 +0000 (17:42 +0300)
committervsv <vsv@opencascade.com>
Mon, 25 Dec 2017 14:42:02 +0000 (17:42 +0300)
commitdc7d4d86b58b81684abc9b5a2be8ec30f210c2da
tree8a2d697166e2499154b079c391f4a11e5a954627
parent756e01646844fa169efde2e4f81b26262f37431f
parent8661d2c967789409e8db8df5d337100c482e54e3
Merge branch 'Dev_GroupsRevision'

# Conflicts:
# src/ModuleBase/CMakeLists.txt
# src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
# src/ModuleBase/ModuleBase_WidgetMultiSelector.h
# src/XGUI/XGUI_pictures.qrc
12 files changed:
src/GeomAPI/GeomAPI_Shape.cpp
src/GeomAPI/GeomAPI_Shape.h
src/ModuleBase/CMakeLists.txt
src/ModuleBase/ModuleBase_ModelWidget.h
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
src/ModuleBase/ModuleBase_WidgetMultiSelector.h
src/XGUI/XGUI_ActionsMgr.h
src/XGUI/XGUI_PropertyPanel.cpp
src/XGUI/XGUI_PropertyPanel.h
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h
src/XGUI/XGUI_pictures.qrc