Author |
Committer |
Branch |
Timestamp |
Parent |
mlampert |
GitHub |
master |
2021-01-05 23:48:56 |
master db6a7287 |
Changeset |
Merge branch 'master' into feature/expose-enumerations-to-python |
mod - cMake/FreeCAD_Helpers/PrintFinalReport.cmake |
Diff
File
|
mod - src/Gui/CommandFeat.cpp |
Diff
File
|
mod - src/Gui/CommandStd.cpp |
Diff
File
|
mod - src/Gui/CommandView.cpp |
Diff
File
|
mod - src/Gui/Document.cpp |
Diff
File
|
add - src/Gui/Icons/Std_AxisCross.svg |
Diff
File
|
add - src/Gui/Icons/Std_HideObjects.svg |
Diff
File
|
add - src/Gui/Icons/Std_HideSelection.svg |
Diff
File
|
add - src/Gui/Icons/Std_RandomColor.svg |
Diff
File
|
add - src/Gui/Icons/Std_SelectVisibleObjects.svg |
Diff
File
|
add - src/Gui/Icons/Std_ShowObjects.svg |
Diff
File
|
add - src/Gui/Icons/Std_ShowSelection.svg |
Diff
File
|
add - src/Gui/Icons/Std_TextureMapping.svg |
Diff
File
|
add - src/Gui/Icons/Std_ToggleClipPlane.svg |
Diff
File
|
add - src/Gui/Icons/Std_ToggleNavigation.svg |
Diff
File
|
add - src/Gui/Icons/Std_ToggleObjects.svg |
Diff
File
|
add - src/Gui/Icons/Std_ToggleVisibility.svg |
Diff
File
|
add - src/Gui/Icons/Std_ViewDimetric.svg |
Diff
File
|
add - src/Gui/Icons/Std_ViewHome.svg |
Diff
File
|
add - src/Gui/Icons/Std_ViewIvIssueCamPos.svg |
Diff
File
|
add - src/Gui/Icons/Std_ViewTrimetric.svg |
Diff
File
|
mod - src/Gui/Icons/resource.qrc |
Diff
File
|
mod - src/Gui/View3DInventor.cpp |
Diff
File
|
mod - src/Gui/Workbench.cpp |
Diff
File
|
mod - src/Mod/Arch/ArchSectionPlane.py |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui |
Diff
File
|
mod - src/Mod/Draft/draftfunctions/draftify.py |
Diff
File
|
mod - src/Mod/Draft/draftfunctions/upgrade.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_array_simple.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_clone.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_downgrade.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_draft2sketch.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_facebinders.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_join.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_offset.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_patharray.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_pathtwistedarray.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_pointarray.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_shape2dview.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_split.py |
Diff
File
|
mod - src/Mod/Draft/draftguitools/gui_upgrade.py |
Diff
File
|
mod - src/Mod/Draft/draftmake/make_copy.py |
Diff
File
|
mod - src/Mod/Drawing/Gui/DrawingView.cpp |
Diff
File
|
mod - src/Mod/Drawing/Gui/DrawingView.h |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/box_frequency.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/box_static.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/ccxcantilever_faceload.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/ccxcantilever_hexa20.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/ccxcantilever_nodeload.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/ccxcantilever_prescribeddisplacement.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/constraint_contact_shell_shell.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/constraint_contact_solid_solid.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/constraint_selfweight_cantilever.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/constraint_tie.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fiveboxes.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fivefaces.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_edgeforces.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_nodeforces.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/thermomech_flow1D.inp |
Diff
File
|
mod - src/Mod/Fem/femtest/data/calculix/thermomech_spine.inp |
Diff
File
|
mod - src/Mod/Path/App/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathAdaptive.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathJob.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathJobCmd.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathJobDlg.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathJobGui.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathSanity.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathToolControllerGui.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathUtils.py |
Diff
File
|
mod - src/Mod/Path/PathTests/TestPathHelix.py |
Diff
File
|
mod - src/Mod/Start/StartPage/StartPage.html |
Diff
File
|
mod - src/Mod/Start/StartPage/TranslationTexts.py |
Diff
File
|
mod - src/Mod/TechDraw/Gui/MDIViewPage.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/MDIViewPage.h |
Diff
File
|