All Projects FreeCAD  Addon Manager  Arch  Assembly  Draft  Expressions  FEM  File formats  GCS  OpenSCAD  Part  PartDesign  Path  Project Tools & Websites  Raytracing  Robot  Sketcher  Spreadsheet  TechDraw

FreeCAD: master 140c2ea1

Diff Back to Repository
Author Committer Branch Timestamp Parent
carlopav carlopav master 2020-01-09 13:42:58 master 9e2e8251
Changeset Merge branch 'master' into DraftModifiersAppPart

merged upstream master and resolved conflicts
mod - cMake/FindPySide2Tools.cmake Diff File
mod - cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake Diff File
mod - src/App/ExpressionParser.l Diff File
mod - src/App/FreeCADInit.py Diff File
mod - src/Base/Quantity.cpp Diff File
mod - src/Base/Quantity.h Diff File
mod - src/Base/QuantityLexer.c Diff File
mod - src/Base/QuantityParser.l Diff File
mod - src/Base/Unit.cpp Diff File
mod - src/Base/Unit.h Diff File
mod - src/Base/UnitsSchemaInternal.cpp Diff File
mod - src/Base/UnitsSchemaMKS.cpp Diff File
mod - src/Ext/freecad/CMakeLists.txt Diff File
rm - src/Ext/freecad/__init__.py Diff File
add - src/Ext/freecad/__init__.py.template Diff File
mod - src/Gui/CommandDoc.cpp Diff File
mod - src/Gui/CommandView.cpp Diff File
mod - src/Gui/CommandWindow.cpp Diff File
mod - src/Gui/DlgActionsImp.cpp Diff File
mod - src/Gui/DlgActionsImp.h Diff File
mod - src/Gui/DlgCommandsImp.cpp Diff File
mod - src/Gui/DlgCommandsImp.h Diff File
mod - src/Gui/DlgCustomizeSpNavSettings.cpp Diff File
mod - src/Gui/DlgCustomizeSpNavSettings.h Diff File
mod - src/Gui/DlgDisplayPropertiesImp.cpp Diff File
mod - src/Gui/DlgDisplayPropertiesImp.h Diff File
mod - src/Gui/DlgEditorImp.cpp Diff File
mod - src/Gui/DlgEditorImp.h Diff File
mod - src/Gui/DlgInputDialogImp.cpp Diff File
mod - src/Gui/DlgInputDialogImp.h Diff File
mod - src/Gui/DlgKeyboardImp.cpp Diff File
mod - src/Gui/DlgKeyboardImp.h Diff File
mod - src/Gui/DlgMacroExecuteImp.cpp Diff File
mod - src/Gui/DlgMacroExecuteImp.h Diff File
mod - src/Gui/DlgMacroRecord.ui Diff File
mod - src/Gui/DlgMacroRecordImp.cpp Diff File
mod - src/Gui/DlgMacroRecordImp.h Diff File
mod - src/Gui/DlgMaterialPropertiesImp.cpp Diff File
mod - src/Gui/DlgMaterialPropertiesImp.h Diff File
mod - src/Gui/DlgOnlineHelpImp.cpp Diff File
mod - src/Gui/DlgOnlineHelpImp.h Diff File
mod - src/Gui/DlgReportViewImp.cpp Diff File
mod - src/Gui/DlgReportViewImp.h Diff File
mod - src/Gui/DlgSettings3DViewImp.cpp Diff File
mod - src/Gui/DlgSettings3DViewImp.h Diff File
mod - src/Gui/DlgSettingsColorGradientImp.cpp Diff File
mod - src/Gui/DlgSettingsColorGradientImp.h Diff File
mod - src/Gui/DlgSettingsDocumentImp.cpp Diff File
mod - src/Gui/DlgSettingsDocumentImp.h Diff File
mod - src/Gui/DlgSettingsImage.ui Diff File
mod - src/Gui/DlgSettingsImageImp.cpp Diff File
mod - src/Gui/DlgSettingsImageImp.h Diff File
mod - src/Gui/DlgSettingsMacroImp.cpp Diff File
mod - src/Gui/DlgSettingsMacroImp.h Diff File
mod - src/Gui/DlgSettingsViewColor.cpp Diff File
mod - src/Gui/DlgSettingsViewColor.h Diff File
mod - src/Gui/DlgToolbarsImp.cpp Diff File
mod - src/Gui/DlgToolbarsImp.h Diff File
mod - src/Gui/DlgUnitsCalculatorImp.cpp Diff File
mod - src/Gui/DlgWorkbenchesImp.cpp Diff File
mod - src/Gui/DlgWorkbenchesImp.h Diff File
mod - src/Gui/MainWindow.cpp Diff File
mod - src/Gui/Placement.cpp Diff File
mod - src/Gui/Placement.ui Diff File
mod - src/Gui/QuantitySpinBox.cpp Diff File
mod - src/Gui/QuantitySpinBox.h Diff File
mod - src/Gui/Quarter/QuarterWidget.cpp Diff File
mod - src/Gui/ViewProviderLink.cpp Diff File
mod - src/Gui/resource.cpp Diff File
mod - src/Mod/Arch/ArchWall.py Diff File
mod - src/Mod/Arch/InitGui.py Diff File
mod - src/Mod/Arch/Resources/Arch.qrc Diff File
mod - src/Mod/Arch/importIFC.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/DraftGeomUtils.py Diff File
mod - src/Mod/Draft/DraftGui.py Diff File
mod - src/Mod/Draft/DraftTools.py Diff File
mod - src/Mod/Draft/DraftTrackers.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_CircularArray.svg Diff File
add - src/Mod/Draft/Resources/ui/TaskPanel_CircularArray.ui Diff File
add - src/Mod/Draft/draftguitools/gui_circulararray.py Diff File
add - src/Mod/Draft/draftobjects/circulararray.py Diff File
add - src/Mod/Draft/drafttaskpanels/task_circulararray.py Diff File
add - src/Mod/Draft/draftutils/__init__.py Diff File
add - src/Mod/Draft/draftutils/utils.py Diff File
add - src/Mod/Draft/draftviewproviders/view_circulararray.py Diff File
mod - src/Mod/Draft/importDWG.py Diff File
mod - src/Mod/Fem/femguiobjects/FemSelectionWidgets.py Diff File
mod - src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGmsh.py Diff File
mod - src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py Diff File
mod - src/Mod/Fem/feminout/importToolsFem.py Diff File
mod - src/Mod/Fem/feminout/importZ88Mesh.py Diff File
mod - src/Mod/Fem/feminout/importZ88O2Results.py Diff File
mod - src/Mod/Fem/feminout/readFenicsXML.py Diff File
mod - src/Mod/Fem/femmesh/gmshtools.py Diff File
mod - src/Mod/Fem/femsolver/elmer/tasks.py Diff File
mod - src/Mod/Fem/femtools/ccxtools.py Diff File
mod - src/Mod/Fem/femtools/femutils.py Diff File
mod - src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui Diff File
mod - src/Mod/Part/CompoundTools/CompoundFilter.py Diff File
mod - src/Mod/Part/CompoundTools/_CommandCompoundFilter.py Diff File
mod - src/Mod/Part/Gui/TaskAttacher.cpp Diff File
mod - src/Mod/Part/Gui/TaskAttacher.ui Diff File
mod - src/Mod/TechDraw/Gui/MDIViewPage.cpp Diff File
mod - src/Mod/TechDraw/Gui/QGCustomText.cpp Diff File
mod - src/Mod/TechDraw/Gui/QGIView.cpp Diff File
mod - src/Mod/TechDraw/Gui/QGIViewDimension.cpp Diff File
mod - src/Mod/TechDraw/Gui/QGIViewDimension.h Diff File
mod - src/Mod/TechDraw/Gui/ViewProviderDimension.cpp Diff File
mod - src/Mod/TechDraw/Gui/ViewProviderDimension.h Diff File