]> SALOME platform Git repositories - modules/shaper.git/commit - src/PartSet/PartSet_CenterPrs.h
Salome HOME
Merge remote-tracking branch 'remotes/origin/master' into Dev_2.8.0
authorazv <azv@opencascade.com>
Thu, 21 Sep 2017 07:06:06 +0000 (10:06 +0300)
committerazv <azv@opencascade.com>
Thu, 21 Sep 2017 07:06:06 +0000 (10:06 +0300)
commitb3695c3af5289903f1c0fa01bbb7c40203c5e544
tree2a6e4b6ead4d737ba36cd2939362d9d2775bc87c
parentdd4eeef09743cafa61afc1b7afe7a5c6bdfe3ec7
parent51492b14f4d677eb09bc413257ebd791a7e01810
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:
CMakeLists.txt
src/GeomAPI/GeomAPI_Edge.cpp
src/GeomAPI/GeomAPI_Edge.h
src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp
src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp
src/Model/Model_AttributeSelection.cpp
src/Model/Model_AttributeSelection.h
src/ModelAPI/CMakeLists.txt
src/ModuleBase/ModuleBase_WidgetEditor.cpp
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_WidgetPoint2d.cpp
src/PartSet/PartSet_WidgetSketchLabel.cpp
src/PythonAPI/model/sketcher/tools.py
src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/SketchPlugin_ConstraintLength.cpp
src/SketchPlugin/SketchPlugin_Validators.cpp
src/SketchPlugin/plugin-Sketch.xml
src/SketchSolver/SketchSolver_Manager.cpp
src/SketchSolver/SketchSolver_Manager.h
src/XGUI/XGUI_ContextMenuMgr.cpp
src/XGUI/XGUI_Workshop.cpp