Author |
Committer |
Branch |
Timestamp |
Parent |
yorik |
GitHub |
master |
2020-01-07 10:20:15 |
master 5ad41e27 |
Changeset |
Merge branch 'master' into DraftModifiersAppPart |
mod - src/App/Expression.cpp |
Diff
File
|
mod - src/App/ExpressionParser.l |
Diff
File
|
mod - src/App/FreeCADInit.py |
Diff
File
|
mod - src/App/ObjectIdentifier.cpp |
Diff
File
|
mod - src/App/ObjectIdentifier.h |
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/RotationPyImp.cpp |
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/Gui/DlgUnitsCalculatorImp.cpp |
Diff
File
|
mod - src/Gui/Document.cpp |
Diff
File
|
mod - src/Gui/MDIView.h |
Diff
File
|
mod - src/Gui/Quarter/QuarterWidget.cpp |
Diff
File
|
mod - src/Gui/SplitView3DInventor.cpp |
Diff
File
|
mod - src/Gui/SplitView3DInventor.h |
Diff
File
|
mod - src/Gui/View3DInventor.cpp |
Diff
File
|
mod - src/Gui/View3DInventor.h |
Diff
File
|
mod - src/Gui/View3DInventorViewer.cpp |
Diff
File
|
mod - src/Gui/View3DInventorViewer.h |
Diff
File
|
mod - src/Gui/ViewProvider.h |
Diff
File
|
mod - src/Gui/ViewProviderDocumentObject.cpp |
Diff
File
|
mod - src/Gui/ViewProviderPythonFeature.h |
Diff
File
|
mod - src/Gui/propertyeditor/PropertyItem.cpp |
Diff
File
|
mod - src/Mod/Arch/ArchMaterial.py |
Diff
File
|
mod - src/Mod/Draft/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Draft/DraftEdit.py |
Diff
File
|
mod - src/Mod/Draft/DraftGeomUtils.py |
Diff
File
|
mod - src/Mod/Draft/DraftLayer.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_PolarArray.svg |
Diff
File
|
add - src/Mod/Draft/Resources/ui/TaskPanel_PolarArray.ui |
Diff
File
|
add - src/Mod/Draft/draftguitools/gui_polararray.py |
Diff
File
|
add - src/Mod/Draft/draftobjects/polararray.py |
Diff
File
|
add - src/Mod/Draft/drafttaskpanels/task_polararray.py |
Diff
File
|
add - src/Mod/Draft/draftviewproviders/view_polararray.py |
Diff
File
|
mod - src/Mod/Fem/Gui/Resources/translations/Fem_ru.qm |
Diff
File
|
mod - src/Mod/Fem/Gui/Resources/translations/Fem_ru.ts |
Diff
File
|
mod - src/Mod/Fem/Gui/Resources/ui/ResultShow.ui |
Diff
File
|
mod - src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml |
Diff
File
|
mod - src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp |
Diff
File
|
mod - src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py |
Diff
File
|
mod - src/Mod/Fem/femguiobjects/_ViewProviderFemMaterialReinforced.py |
Diff
File
|
mod - src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.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/writerbase.py |
Diff
File
|
mod - src/Mod/Material/importFCMat.py |
Diff
File
|
mod - src/Mod/Mesh/App/MeshTestsApp.py |
Diff
File
|
mod - src/Mod/Mesh/Gui/ViewProvider.h |
Diff
File
|
mod - src/Mod/Part/App/TopoShape.cpp |
Diff
File
|
mod - src/Mod/Part/App/TopoShape.h |
Diff
File
|
mod - src/Mod/PartDesign/App/FeaturePipe.cpp |
Diff
File
|
mod - src/Mod/PartDesign/App/ShapeBinder.cpp |
Diff
File
|
mod - src/Mod/PartDesign/App/ShapeBinder.h |
Diff
File
|
mod - src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp |
Diff
File
|
mod - src/Mod/Path/PathCommands.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/PathDressupAxisMap.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupDogbone.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupDragknife.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupLeadInOut.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupPathBoundary.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupRampEntry.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupTag.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDressupTagGui.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathDrilling.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathEngrave.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathEngraveBase.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathEngraveGui.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathGeom.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathIconViewProvider.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathJob.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathJobDlg.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathMillFace.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathOp.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/PathPocket.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathPocketBase.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathPocketShape.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathPocketShapeGui.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathPost.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathProfileBase.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathProfileContour.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/PathSetupSheet.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathSetupSheetOpPrototype.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathStock.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathSurface.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathUtils.py |
Diff
File
|
mod - src/Mod/Path/PathTests/TestPathHelix.py |
Diff
File
|
mod - src/Mod/Robot/KukaExporter.py |
Diff
File
|
mod - src/Mod/Sketcher/Gui/Command.cpp |
Diff
File
|
mod - src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp |
Diff
File
|
mod - src/Mod/Sketcher/Gui/Resources/Sketcher.qrc |
Diff
File
|
rm - src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterConstruction.svg |
Diff
File
|
mod - src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleActiveConstraint.svg |
Diff
File
|
mod - src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg |
Diff
File
|
add - src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction_old.svg |
Diff
File
|
mod - src/Mod/Sketcher/Gui/TaskSketcherElements.cpp |
Diff
File
|
mod - src/Mod/Sketcher/Gui/ViewProviderSketch.cpp |
Diff
File
|
mod - src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_de.qm |
Diff
File
|
mod - src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet_de.ts |
Diff
File
|
mod - src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp |
Diff
File
|
mod - src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp |
Diff
File
|
mod - src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h |
Diff
File
|
mod - src/Mod/Spreadsheet/TestSpreadsheet.py |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawLeaderLine.h |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewBalloon.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewBalloon.h |
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/DrawViewSection.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui |
Diff
File
|
mod - src/Mod/TechDraw/Gui/MDIViewPage.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIArrow.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIArrow.h |
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/QGIUserTypes.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIView.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIView.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIViewBalloon.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIViewBalloon.h |
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/QGIViewPart.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGVPage.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/Resources/TechDraw.qrc |
Diff
File
|
add - src/Mod/TechDraw/Gui/Resources/icons/arrowpyramid.svg |
Diff
File
|
mod - src/Mod/TechDraw/Gui/TaskBalloon.ui |
Diff
File
|
mod - src/Mod/TechDraw/Gui/TaskLeaderLine.ui |
Diff
File
|
mod - src/Mod/TechDraw/Gui/TaskSectionView.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderDrawingView.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderHatch.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderHatch.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderPage.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderPage.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/ViewProviderTemplate.h |
Diff
File
|
mod - src/Mod/TechDraw/TDTest/DVBalloonTest.py |
Diff
File
|