]> SALOME platform Git repositories - modules/shaper.git/commit - src/PartSetPlugin/PartSetPlugin_msg_fr.ts
Salome HOME
Merge remote-tracking branch 'origin/EDF_2019'
authorvsv <vsv@opencascade.com>
Mon, 25 Nov 2019 10:01:42 +0000 (13:01 +0300)
committervsv <vsv@opencascade.com>
Mon, 25 Nov 2019 10:01:42 +0000 (13:01 +0300)
commit584f97832c77adf0c9df154b2f3eb1835bd3ce9e
tree6fdcf0569211d132366ef5cd3fe92b53ecb894c6
parent4bccf0ccd2f13dca7b9d16c59f427dea91c289fa
parent4a4df92151313b04bcedb6b59001658c7038f931
Merge remote-tracking branch 'origin/EDF_2019'

# Conflicts:
# src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_2.py
# src/PartSet/PartSet_WidgetSketchLabel.h
# src/XGUI/XGUI_Workshop.cpp
25 files changed:
src/Config/Config_Keywords.h
src/ExchangePlugin/CMakeLists.txt
src/Model/Model_AttributeSelection.cpp
src/ModuleBase/CMakeLists.txt
src/ModuleBase/ModuleBase_IModule.h
src/ModuleBase/ModuleBase_ModelWidget.cpp
src/ModuleBase/ModuleBase_ModelWidget.h
src/ModuleBase/ModuleBase_Tools.cpp
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
src/PartSet/PartSet_MenuMgr.cpp
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h
src/PartSet/PartSet_SketcherMgr.cpp
src/PartSet/PartSet_SketcherMgr.h
src/PartSet/PartSet_WidgetSketchLabel.cpp
src/PartSet/PartSet_WidgetSketchLabel.h
src/SHAPERGUI/SHAPERGUI.cpp
src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
src/SketchPlugin/plugin-Sketch.xml
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_Displayer.cpp
src/XGUI/XGUI_Displayer.h
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h