| Author |
Committer |
Branch |
Timestamp |
Parent |
| dubstar_04 |
GitHub |
master |
2020-03-03 17:49:43 |
master be9bc406 |
|
|
Changeset |
Merge branch 'master' into fixes/simulation |
| mod - .travis.yml |
Diff
File
|
| mod - src/App/Link.cpp |
Diff
File
|
| mod - src/Gui/DlgSettings3DView.ui |
Diff
File
|
| mod - src/Gui/DlgSettings3DViewImp.cpp |
Diff
File
|
| mod - src/Gui/MainWindow.cpp |
Diff
File
|
| mod - src/Mod/Arch/ArchComponent.py |
Diff
File
|
| mod - src/Mod/Arch/ArchStructure.py |
Diff
File
|
| mod - src/Mod/Arch/InitGui.py |
Diff
File
|
| mod - src/Mod/Arch/exportIFC.py |
Diff
File
|
| mod - src/Mod/Draft/CMakeLists.txt |
Diff
File
|
| mod - src/Mod/Draft/Draft.py |
Diff
File
|
| mod - src/Mod/Draft/DraftEdit.py |
Diff
File
|
| mod - src/Mod/Draft/DraftTools.py |
Diff
File
|
| mod - src/Mod/Draft/InitGui.py |
Diff
File
|
| mod - src/Mod/Draft/Resources/Draft.qrc |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/DraftWorkbench.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_AddPoint.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Apply.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Arc.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Arc_3Points.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Array.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_BSpline.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_BezCurve.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Circle.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_CircularArray.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Clone.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Construction.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_CubicBezCurve.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Cursor.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_DelPoint.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Dimension.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_DimensionAngular.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Dimension_Tree.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Dot.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Downgrade.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Draft.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Drawing.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Edit.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Ellipse.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Facebinder.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Facebinder_Provider.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Fillet.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Finish.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Grid.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Heal.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Join.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Label.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Layer.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Line.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_LinkArray.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Lock.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Macro.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Mirror.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Move.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Offset.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_PathArray.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_PathLinkArray.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Point.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_PointArray.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_PolarArray.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Polygon.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Rectangle.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Rotate.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Scale.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_ShapeString.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Slope.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Snap.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Split.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Stretch.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_SubelementHighlight.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Text.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Trimex.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Upgrade.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_VisGroup.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Wipe.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_Wire.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Angle.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Center.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Dimensions.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Endpoint.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Extension.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Grid.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Intersection.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Lock.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Midpoint.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Near.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Ortho.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Parallel.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_Special.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/icons/preferences-draft.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/brick01.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/concrete.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/cross.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/diagonal1.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/diagonal2.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/earth.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/hbone.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/line.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/plus.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/simple.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/solid.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/square.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/steel.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/wood.svg |
Diff
File
|
| mod - src/Mod/Draft/Resources/patterns/woodgrain.svg |
Diff
File
|
| add - src/Mod/Draft/Resources/ui/TaskPanel_OrthoArray.ui |
Diff
File
|
| add - src/Mod/Draft/draftguitools/gui_arrays.py |
Diff
File
|
| add - src/Mod/Draft/draftguitools/gui_orthoarray.py |
Diff
File
|
| add - src/Mod/Draft/draftobjects/orthoarray.py |
Diff
File
|
| add - src/Mod/Draft/drafttaskpanels/task_orthoarray.py |
Diff
File
|
| mod - src/Mod/Draft/draftutils/init_tools.py |
Diff
File
|
| mod - src/Mod/Draft/draftutils/translate.py |
Diff
File
|
| add - src/Mod/Draft/draftviewproviders/view_orthoarray.py |
Diff
File
|
| mod - src/Mod/Fem/CMakeLists.txt |
Diff
File
|
| mod - src/Mod/Fem/TestFem.py |
Diff
File
|
| mod - src/Mod/Fem/femexamples/ccx_cantilever_std.py |
Diff
File
|
| mod - src/Mod/Fem/femexamples/manager.py |
Diff
File
|
| add - src/Mod/Fem/femexamples/meshes/mesh_canticcx_hexa20.py |
Diff
File
|
| mod - src/Mod/Fem/femmesh/meshtools.py |
Diff
File
|
| mod - src/Mod/Fem/femobjects/_FemConstraintBodyHeatSource.py |
Diff
File
|
| mod - src/Mod/Fem/femobjects/_FemConstraintFlowVelocity.py |
Diff
File
|
| mod - src/Mod/Fem/femobjects/_FemConstraintInitialFlowVelocity.py |
Diff
File
|
| mod - src/Mod/Fem/femobjects/_FemElementFluid1D.py |
Diff
File
|
| mod - src/Mod/Fem/femobjects/_FemElementGeometry1D.py |
Diff
File
|
| mod - src/Mod/Fem/femobjects/_FemElementGeometry2D.py |
Diff
File
|
| mod - src/Mod/Fem/femobjects/_FemElementRotation1D.py |
Diff
File
|
| mod - src/Mod/Fem/femsolver/elmer/equations/elasticity.py |
Diff
File
|
| mod - src/Mod/Fem/femsolver/elmer/equations/electrostatic.py |
Diff
File
|
| mod - src/Mod/Fem/femsolver/elmer/equations/flow.py |
Diff
File
|
| mod - src/Mod/Fem/femsolver/elmer/equations/fluxsolver.py |
Diff
File
|
| mod - src/Mod/Fem/femsolver/elmer/equations/heat.py |
Diff
File
|
| mod - src/Mod/Fem/femsolver/elmer/writer.py |
Diff
File
|
| mod - src/Mod/Fem/femtest/app/test_ccxtools.py |
Diff
File
|
| mod - src/Mod/Fem/femtest/app/test_object.py |
Diff
File
|
| add - src/Mod/Fem/femtest/data/ccx/canti_ccx_faceload_hexa20.inp |
Diff
File
|
| mod - src/Mod/Fem/femtools/membertools.py |
Diff
File
|
| mod - src/Mod/Image/ImageTools/_CommandImageScaling.py |
Diff
File
|
| mod - src/Mod/Mesh/App/Core/Approximation.cpp |
Diff
File
|
| mod - src/Mod/Mesh/App/Core/Approximation.h |
Diff
File
|
| mod - src/Mod/Mesh/App/Core/Segmentation.cpp |
Diff
File
|
| mod - src/Mod/Mesh/App/Core/Segmentation.h |
Diff
File
|
| mod - src/Mod/Mesh/App/Mesh.cpp |
Diff
File
|
| mod - src/Mod/Mesh/App/MeshPyImp.cpp |
Diff
File
|
| mod - src/Mod/Mesh/Gui/Segmentation.cpp |
Diff
File
|
| mod - src/Mod/Mesh/Gui/SegmentationBestFit.cpp |
Diff
File
|
| mod - src/Mod/PartDesign/App/FeatureDressUp.cpp |
Diff
File
|
| mod - src/Mod/Path/PathScripts/post/linuxcnc_post.py |
Diff
File
|
| mod - src/Mod/Path/PathTests/TestPathToolController.py |
Diff
File
|
| mod - src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp |
Diff
File
|
| mod - src/Mod/ReverseEngineering/App/SampleConsensus.cpp |
Diff
File
|
| mod - src/Mod/ReverseEngineering/App/SampleConsensus.h |
Diff
File
|
| mod - src/Mod/ReverseEngineering/Gui/CMakeLists.txt |
Diff
File
|
| mod - src/Mod/ReverseEngineering/Gui/Command.cpp |
Diff
File
|
| add - src/Mod/ReverseEngineering/Gui/Segmentation.cpp |
Diff
File
|
| add - src/Mod/ReverseEngineering/Gui/Segmentation.h |
Diff
File
|
| add - src/Mod/ReverseEngineering/Gui/Segmentation.ui |
Diff
File
|
| mod - src/Mod/ReverseEngineering/Gui/Workbench.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/App/DrawViewDimension.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/App/DrawViewDimension.h |
Diff
File
|
| mod - src/Mod/TechDraw/App/DrawViewDimensionPy.xml |
Diff
File
|
| mod - src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/QGIViewDimension.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/QGIViewDimension.h |
Diff
File
|
FreeCAD
