Author |
Committer |
Branch |
Timestamp |
Parent |
Gauthier |
Gauthier |
master |
2020-04-11 15:06:31 |
master bc956951 |
Changeset |
Merge remote-tracking branch 'upstream/master' |
mod - data/examples/CMakeLists.txt |
Diff
File
|
add - data/examples/draft_test_objects.FCStd |
Diff
File
|
mod - src/App/DocumentObject.h |
Diff
File
|
mod - src/App/Extension.cpp |
Diff
File
|
mod - src/App/Part.h |
Diff
File
|
mod - src/App/Property.h |
Diff
File
|
mod - src/App/PropertyGeo.cpp |
Diff
File
|
mod - src/App/PropertyStandard.cpp |
Diff
File
|
mod - src/Base/Builder3D.cpp |
Diff
File
|
mod - src/Base/Builder3D.h |
Diff
File
|
mod - src/Base/Console.cpp |
Diff
File
|
mod - src/Base/Exception.cpp |
Diff
File
|
mod - src/Base/Interpreter.cpp |
Diff
File
|
mod - src/Base/MatrixPyImp.cpp |
Diff
File
|
mod - src/Base/Quantity.cpp |
Diff
File
|
mod - src/Base/Rotation.cpp |
Diff
File
|
mod - src/Base/Tools.h |
Diff
File
|
mod - src/Base/Tools2D.cpp |
Diff
File
|
mod - src/Base/Type.cpp |
Diff
File
|
mod - src/Base/Unit.cpp |
Diff
File
|
mod - src/Base/UnitPyImp.cpp |
Diff
File
|
mod - src/Base/Vector3D.cpp |
Diff
File
|
mod - src/Base/Vector3D.h |
Diff
File
|
mod - src/Base/VectorPy.xml |
Diff
File
|
mod - src/Base/VectorPyImp.cpp |
Diff
File
|
mod - src/Gui/Application.cpp |
Diff
File
|
mod - src/Gui/Application.h |
Diff
File
|
mod - src/Gui/ApplicationPy.cpp |
Diff
File
|
mod - src/Gui/CommandDoc.cpp |
Diff
File
|
mod - src/Gui/DlgSettings3DView.ui |
Diff
File
|
mod - src/Gui/DlgSettings3DViewImp.cpp |
Diff
File
|
mod - src/Gui/FreeCADGuiInit.py |
Diff
File
|
mod - src/Gui/PythonWorkbenchPy.xml |
Diff
File
|
mod - src/Gui/PythonWorkbenchPyImp.cpp |
Diff
File
|
mod - src/Gui/Quarter/QuarterWidget.cpp |
Diff
File
|
mod - src/Gui/View3DInventor.cpp |
Diff
File
|
mod - src/Gui/View3DInventorViewer.cpp |
Diff
File
|
mod - src/Gui/Workbench.cpp |
Diff
File
|
mod - src/Gui/Workbench.h |
Diff
File
|
mod - src/Gui/WorkbenchPy.xml |
Diff
File
|
mod - src/Gui/WorkbenchPyImp.cpp |
Diff
File
|
mod - src/Gui/propertyeditor/PropertyItem.cpp |
Diff
File
|
mod - src/Mod/AddonManager/AddonManager.py |
Diff
File
|
mod - src/Mod/AddonManager/addonmanager_utilities.py |
Diff
File
|
mod - src/Mod/Arch/ArchPanel.py |
Diff
File
|
mod - src/Mod/Arch/ArchPipe.py |
Diff
File
|
mod - src/Mod/Arch/ArchRebar.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/Assembly/App/AppAssembly.cpp |
Diff
File
|
mod - src/Mod/Assembly/App/Product.h |
Diff
File
|
mod - src/Mod/Cloud/App/AppCloud.cpp |
Diff
File
|
mod - src/Mod/Cloud/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Draft/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Draft/Draft.py |
Diff
File
|
mod - src/Mod/Draft/DraftGeomUtils.py |
Diff
File
|
mod - src/Mod/Draft/DraftGui.py |
Diff
File
|
mod - src/Mod/Draft/DraftTools.py |
Diff
File
|
mod - src/Mod/Draft/DraftVecUtils.py |
Diff
File
|
mod - src/Mod/Draft/Init.py |
Diff
File
|
mod - src/Mod/Draft/InitGui.py |
Diff
File
|
mod - src/Mod/Draft/Resources/Draft.qrc |
Diff
File
|
add - src/Mod/Draft/Resources/icons/Draft_PlaneProxy.svg |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/TaskPanel_OrthoArray.ui |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/TaskPanel_PolarArray.ui |
Diff
File
|
mod - src/Mod/Draft/TestDraft.py |
Diff
File
|
add - src/Mod/Draft/TestDraftGui.py |
Diff
File
|
mod - src/Mod/Draft/WorkingPlane.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/__init__.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_arrays.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_base.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_circulararray.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_orthoarray.py |
Diff
File
|
add - src/Mod/Draft/draftguitools/gui_planeproxy.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_polararray.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_snapper.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_snaps.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_trackers.py |
Diff
File
|
mod - src/Mod/Draft/draftobjects/__init__.py |
Diff
File
|
mod - src/Mod/Draft/draftobjects/arc_3points.py |
Diff
File
|
mod - src/Mod/Draft/draftobjects/circulararray.py |
Diff
File
|
mod - src/Mod/Draft/draftobjects/orthoarray.py |
Diff
File
|
mod - src/Mod/Draft/draftobjects/polararray.py |
Diff
File
|
mod - src/Mod/Draft/drafttaskpanels/__init__.py |
Diff
File
|
mod - src/Mod/Draft/drafttaskpanels/task_circulararray.py |
Diff
File
|
mod - src/Mod/Draft/drafttaskpanels/task_orthoarray.py |
Diff
File
|
mod - src/Mod/Draft/drafttaskpanels/task_polararray.py |
Diff
File
|
add - src/Mod/Draft/drafttaskpanels/task_scale.py |
Diff
File
|
add - src/Mod/Draft/drafttaskpanels/task_selectplane.py |
Diff
File
|
add - src/Mod/Draft/drafttaskpanels/task_shapestring.py |
Diff
File
|
mod - src/Mod/Draft/drafttests/__init__.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/drafttests/test_modification.py |
Diff
File
|
mod - src/Mod/Draft/drafttests/test_pivy.py |
Diff
File
|
mod - src/Mod/Draft/draftutils/__init__.py |
Diff
File
|
mod - src/Mod/Draft/draftutils/gui_utils.py |
Diff
File
|
mod - src/Mod/Draft/draftutils/init_tools.py |
Diff
File
|
mod - src/Mod/Draft/draftutils/messages.py |
Diff
File
|
mod - src/Mod/Draft/draftutils/todo.py |
Diff
File
|
mod - src/Mod/Draft/draftutils/utils.py |
Diff
File
|
mod - src/Mod/Draft/draftviewproviders/__init__.py |
Diff
File
|
mod - src/Mod/Draft/importSVG.py |
Diff
File
|
mod - src/Mod/Mesh/Gui/DlgSettingsImportExport.ui |
Diff
File
|
mod - src/Mod/Part/App/AppPartPy.cpp |
Diff
File
|
mod - src/Mod/Part/Gui/DlgSettingsObjectColor.ui |
Diff
File
|
mod - src/Mod/Part/Gui/ViewProviderExt.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/ViewProviderDatum.h |
Diff
File
|
mod - src/Mod/PartDesign/Gui/Workbench.cpp |
Diff
File
|
mod - src/Mod/Path/App/Area.cpp |
Diff
File
|
mod - src/Mod/Path/App/ParamsHelper.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-Waterline.svg |
Diff
File
|
mod - src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/PageOpWaterlineEdit.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/PathCircularHoleBase.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDeburr.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupLeadInOut.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupZCorrect.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathEngraveBase.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathGui.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/PathOpGui.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathOpTools.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathPocketShape.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathProbe.py |
Diff
File
|
mod - 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/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/libarea/kurve/geometry.h |
Diff
File
|
mod - src/Mod/Sketcher/Gui/TaskSketcherElements.cpp |
Diff
File
|
mod - src/Mod/Sketcher/Gui/TaskSketcherElements.h |
Diff
File
|
mod - src/Mod/Spreadsheet/App/PropertySheet.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawUtil.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawUtil.h |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewDetail.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewSymbol.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawWeldSymbol.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Mod/TechDraw/Gui/Command.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/DlgPrefsTechDraw4.ui |
Diff
File
|
add - src/Mod/TechDraw/Gui/QGIGhostHighlight.cpp |
Diff
File
|
add - src/Mod/TechDraw/Gui/QGIGhostHighlight.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIHighlight.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIHighlight.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIUserTypes.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIView.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGVPage.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/Rez.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/Rez.h |
Diff
File
|
add - src/Mod/TechDraw/Gui/TaskDetail.cpp |
Diff
File
|
add - src/Mod/TechDraw/Gui/TaskDetail.h |
Diff
File
|
add - src/Mod/TechDraw/Gui/TaskDetail.ui |
Diff
File
|
mod - src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderViewPart.h |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/edge-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/flanging.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/flare-bevel-groove.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/flare-v-groove.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/gost-2_312/cathetus.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/gost-2_312/gost-2_312-intermittent.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/gost-2_312/gost-2_312-non-closed.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/gost-2_312/gost-2_312-site-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/gost-2_312/gost-2_312-smooth-processing.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/gost-2_312/gost-2_312-usilenie-remove.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/seam-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-bevel-cjp-groove-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-bevel-groove-weld-with-broad-root-face.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-bevel-groove-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-j-groove-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-u-groove-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-v-cjp-groove-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-v-groove-weld-with-broad-root-face.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/single-v-groove-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/spile-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/square-groove-weld.svg |
Diff
File
|
mod - src/Mod/TechDraw/Symbols/Welding/GOST/surfacing.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/gd-and-t/ConcentricityFrame.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/gd-and-t/CylindricityFrame.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/gd-and-t/FlatnessFrame.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/gd-and-t/ParallelismFrame.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/gd-and-t/ReferenceSurface.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/gd-and-t/RoundnessFrame.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/gd-and-t/SquarenessFrame.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/CutLine.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/Diameter.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/Envelope.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/FilletInside.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/FilletOutside.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/IndexCircle.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/IndexTriangle.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/InsideEdgeBroken.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/OutsideEdgeBroken.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/Rectangle.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/SectionLine.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/other/Square.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/surface-roughness-symbols/Roughness.svg |
Diff
File
|
add - src/Mod/TechDraw/Symbols/surface-roughness-symbols/RoughnessGeneral.svg |
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
|
rm - src/Tools/thumbs/ThumbnailProvider/ThumbnailProvider.sln |
Diff
File
|