Salome HOME
Merge branch 'cadbld'
authormpv <mpv@opencascade.com>
Wed, 29 Dec 2021 14:14:45 +0000 (17:14 +0300)
committermpv <mpv@opencascade.com>
Wed, 29 Dec 2021 14:14:45 +0000 (17:14 +0300)
commit766ce5d72bbae841d6c042befdf95e7d945039e1
treeea511addd524a80bb00d125c9fbf90701fe38acf
parent264b53a6292f1a50fbe94ffc62b931c4a047c256
parenta36923e4ef2c8bdfe3ff3fdf6692b2cb181dbc72
Merge branch 'cadbld'

# Conflicts:
# src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp
# src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
# src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
# src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
# src/FeaturesPlugin/FeaturesPlugin_Scale.cpp
# src/FeaturesPlugin/FeaturesPlugin_Symmetry.cpp
# src/FeaturesPlugin/FeaturesPlugin_Translation.cpp
16 files changed:
src/Config/Config_ModuleReader.cpp
src/ExchangePlugin/ExchangePlugin_Import.cpp
src/FeaturesPlugin/FeaturesPlugin_MultiRotation.cpp
src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp
src/FeaturesPlugin/FeaturesPlugin_Scale.cpp
src/FeaturesPlugin/FeaturesPlugin_Symmetry.cpp
src/FeaturesPlugin/FeaturesPlugin_Tools.cpp
src/FeaturesPlugin/FeaturesPlugin_Tools.h
src/FeaturesPlugin/FeaturesPlugin_Translation.cpp
src/ModelAPI/ModelAPI_Events.cpp
src/ModelAPI/ModelAPI_Events.h
src/ModelAPI/ModelAPI_Tools.cpp
src/ModelAPI/ModelAPI_Tools.h
src/PartSet/PartSet_Module.cpp