| Author | 
Committer | 
Branch | 
Timestamp | 
Parent | 
| Patrick Felixberger | 
Patrick Felixberger | 
master | 
2020-03-31 15:18:06 | 
master 7997ad73 | 
| 
	Changeset | 
Merge branch 'master' of https://github.com/FreeCAD/FreeCAD into deburr+dressup | 
| mod - data/examples/CMakeLists.txt | 
	
		Diff	
	
		File	
 | 
| add - data/examples/draft_test_objects.FCStd | 
	
		Diff	
	
		File	
 | 
| mod - src/Base/UnitsSchema.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Base/UnitsSchemaCentimeters.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Base/UnitsSchemaImperial1.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Base/UnitsSchemaInternal.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Base/UnitsSchemaMKS.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Base/UnitsSchemaMmMin.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/Application.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/CMakeLists.txt | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/Control.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/DlgGeneralImp.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/DlgSettingsColorGradientImp.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/DlgUnitsCalculatorImp.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/DocumentRecovery.cpp | 
	
		Diff	
	
		File	
 | 
| add - src/Gui/ExpressionBindingPy.cpp | 
	
		Diff	
	
		File	
 | 
| add - src/Gui/ExpressionBindingPy.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/NaviCube.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/Placement.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/Placement.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Gui/propertyeditor/PropertyItem.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/AddonManager/addonmanager_workers.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Arch/ArchCommands.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Arch/ArchComponent.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Arch/ArchPanel.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Arch/ArchStructure.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Arch/ArchWall.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Arch/ArchWindow.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/DraftFillet.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Draft/DraftTools.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Draft/coding_conventions.md | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Draft/draftguitools/gui_snapper.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Draft/drafttests/test_import_gui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Draft/drafttests/test_import_tools.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Draft/draftutils/init_tools.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/CMakeLists.txt | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/femguiobjects/FemSelectionWidgets.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/feminout/importZ88Mesh.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/femmesh/gmshtools.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/femmesh/meshtools.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/femsolver/calculix/writer.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/femsolver/z88/writer.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Fem/femtools/femutils.py | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Fem/femtools/geomtools.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Image/ImageTools/_CommandImageScaling.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Import/Init.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Import/InitGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Material/Material.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Part/App/PartFeature.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Part/Gui/AttacherTexts.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Part/Gui/DlgFilletEdges.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Part/Gui/TaskAttacher.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/PartDesign/Gui/CommandBody.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/PartDesign/Gui/TaskPrimitiveParameters.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/CMakeLists.txt | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/Gui/Resources/Path.qrc | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/Gui/Resources/icons/Path-Probe.svg | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/Gui/Resources/icons/Path-Waterline.svg | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/Gui/Resources/panels/PageOpDrillingEdit.ui | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/Gui/Resources/panels/PageOpProbeEdit.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.ui | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/Gui/Resources/panels/ZCorrectEdit.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/InitGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathAreaOp.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathCustom.py | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/PathScripts/PathDressupZCorrect.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathDrillingGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathGeom.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathGuiInit.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathMillFace.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathPocketShape.py | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/PathScripts/PathProbe.py | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/PathScripts/PathProbeGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathProfileEdges.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathProfileFaces.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathSelection.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathSetupSheetOpPrototype.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathSurface.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/PathSurfaceGui.py | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/PathScripts/PathWaterline.py | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/PathScripts/PathWaterlineGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/post/example_pre.py | 
	
		Diff	
	
		File	
 | 
| add - src/Mod/Path/PathScripts/post/gcode_pre.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Path/PathScripts/post/grbl_post.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Raytracing/Init.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Raytracing/InitGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/ReverseEngineering/Init.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/ReverseEngineering/InitGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Robot/Init.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Robot/InitGui.py | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Sketcher/App/planegcs/GCS.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Sketcher/Gui/Command.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Spreadsheet/App/Cell.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/Spreadsheet/Gui/SheetModel.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawProjGroup.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawTile.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawTile.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawTileWeld.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawView.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawViewClip.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawViewDetail.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawViewDetail.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawViewPart.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawViewSection.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawViewSection.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/App/DrawWeldSymbol.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw1Imp.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw2Imp.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw4Imp.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/DlgTemplateField.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/QGILeaderLine.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/QGISectionLine.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/QGISectionLine.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/QGIViewPart.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/SymbolChooser.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/SymbolChooser.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/SymbolChooser.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskActiveView.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskActiveView.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskBalloon.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskBalloon.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskCenterLine.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskCenterLine.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskCenterLine.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskCosVertex.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskCosVertex.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskGeomHatch.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskGeomHatch.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskLeaderLine.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskLeaderLine.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskLineDecor.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskLineDecor.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskProjGroup.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskRestoreLines.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskRichAnno.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskRichAnno.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskSectionView.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskSectionView.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskSectionView.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskWeldingSymbol.h | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/TaskWeldingSymbol.ui | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp | 
	
		Diff	
	
		File	
 | 
| mod - src/Mod/TechDraw/Gui/ViewProviderViewPart.h | 
	
		Diff	
	
		File	
 | 
| add - src/Tools/plugins/widget/FreeCAD_widgets.sln | 
	
		Diff	
	
		File	
 | 
| add - src/Tools/plugins/widget/FreeCAD_widgets.vcxproj | 
	
		Diff	
	
		File	
 | 
| add - src/Tools/plugins/widget/FreeCAD_widgets.vcxproj.filters | 
	
		Diff	
	
		File	
 | 
| add - src/Tools/plugins/widget/FreeCAD_widgets.vcxproj.user | 
	
		Diff	
	
		File	
 | 
| mod - src/Tools/thumbs/ThumbnailProvider/Main.cpp | 
	
		Diff	
	
		File	
 |