Salome HOME
Merge remote-tracking branch 'remotes/origin/Filters_Development_2'
authorazv <azv@opencascade.com>
Fri, 12 Jul 2019 06:56:55 +0000 (09:56 +0300)
committerazv <azv@opencascade.com>
Fri, 12 Jul 2019 06:56:55 +0000 (09:56 +0300)
commit4c74e5b864eef28128e27b3ece944990ca8f3fbe
tree02c9076d9662bc67f4c2c095b4e50c9eb5bc8836
parent48c18f7fc10322e9976878236f5e19413a755a65
parent5188fc4ba5d05efdcfa3ba81713d3adfe2f0319b
Merge remote-tracking branch 'remotes/origin/Filters_Development_2'

# Conflicts:
# src/FeaturesPlugin/CMakeLists.txt
# src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
# src/FeaturesPlugin/FeaturesPlugin_Recover.cpp
# src/FeaturesPlugin/FeaturesPlugin_Validators.cpp
# src/GeomAlgoAPI/CMakeLists.txt
# src/ModuleBase/CMakeLists.txt
# src/XGUI/XGUI_ActiveControlMgr.cpp
# src/XGUI/XGUI_Workshop.cpp
# src/XGUI/XGUI_pictures.qrc
src/GeomAPI/GeomAPI_Edge.cpp
src/Model/Model_Objects.cpp
src/ModuleBase/CMakeLists.txt
src/ModuleBase/ModuleBase_ModelWidget.h
src/XGUI/XGUI_ActiveControlMgr.cpp
src/XGUI/XGUI_ContextMenuMgr.cpp
src/XGUI/XGUI_InspectionPanel.cpp
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h
src/XGUI/XGUI_pictures.qrc