]>
SALOME platform Git repositories - modules/shaper.git/commit - src/PartSet/PartSet_CenterPrs.h
Merge remote-tracking branch 'remotes/origin/master' into Dev_2.8.0
# Conflicts:
# CMakeCommon/FindTInspector.cmake
# env.sh
# src/GeomAPI/GeomAPI_Edge.cpp
# src/Model/Model_AttributeSelection.cpp
# src/ModelAPI/ModelAPI_Events.cpp
# src/PythonAPI/model/sketcher/tools.py
# src/SketchAPI/SketchAPI_Sketch.cpp
# src/SketchPlugin/CMakeLists.txt
# src/SketchPlugin/SketchPlugin_ConstraintDistanceHorizontal.cpp
# src/SketchPlugin/SketchPlugin_ConstraintDistanceHorizontal.h
# src/SketchPlugin/SketchPlugin_ConstraintDistanceVertical.cpp
# src/SketchPlugin/SketchPlugin_ConstraintDistanceVertical.h
# src/SketchPlugin/SketchPlugin_Ellipse.cpp
# src/SketchPlugin/SketchPlugin_Ellipse.h
# src/SketchPlugin/SketchPlugin_MacroEllipse.h
# src/SketchSolver/SketchSolver_ConstraintDistance.cpp
# src/SketchSolver/SketchSolver_ConstraintMovement.cpp
# src/SketchSolver/SketchSolver_Manager.cpp
# src/XGUI/XGUI_Workshop.cpp
21 files changed: