| Author |
Committer |
Branch |
Timestamp |
Parent |
| mlampert |
GitHub |
master |
2020-02-06 21:59:32 |
master abb2865e |
|
|
Changeset |
Merge branch 'master' into bugfix/path-tag-dressup-issue |
| mod - src/App/Application.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/CommandFeat.cpp |
Diff
File
|
| mod - src/Gui/NaviCube.cpp |
Diff
File
|
| mod - src/Gui/Workbench.cpp |
Diff
File
|
| mod - src/Mod/AddonManager/AddonManager.py |
Diff
File
|
| mod - src/Mod/AddonManager/AddonManager.ui |
Diff
File
|
| mod - src/Mod/Arch/importIFCHelper.py |
Diff
File
|
| mod - src/Mod/Draft/DraftGui.py |
Diff
File
|
| mod - src/Mod/Draft/Resources/ui/preferences-draft.ui |
Diff
File
|
| add - src/Mod/Draft/draftguitools/README.md |
Diff
File
|
| add - src/Mod/Draft/draftobjects/README.md |
Diff
File
|
| add - src/Mod/Draft/drafttaskpanels/README.md |
Diff
File
|
| add - src/Mod/Draft/draftviewproviders/README.md |
Diff
File
|
| mod - src/Mod/Drawing/Templates/A3_Landscape.svg |
Diff
File
|
| mod - src/Mod/Drawing/Templates/A4_Landscape.svg |
Diff
File
|
| mod - src/Mod/Fem/CMakeLists.txt |
Diff
File
|
| mod - src/Mod/Fem/Gui/Resources/Fem.qrc |
Diff
File
|
| rm - src/Mod/Fem/Gui/Resources/icons/fem-solver-cfd.svg |
Diff
File
|
| mod - src/Mod/Fem/Gui/Resources/ui/ResultShow.ui |
Diff
File
|
| mod - src/Mod/Fem/TestFem.py |
Diff
File
|
| mod - src/Mod/Fem/femexamples/constraint_contact_shell_shell.py |
Diff
File
|
| mod - src/Mod/Fem/femexamples/constraint_contact_solid_solid.py |
Diff
File
|
| mod - src/Mod/Fem/femexamples/manager.py |
Diff
File
|
| add - src/Mod/Fem/femexamples/meshes/mesh_thermomech_bimetall_tetra10.py |
Diff
File
|
| add - src/Mod/Fem/femexamples/thermomech_bimetall.py |
Diff
File
|
| mod - src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py |
Diff
File
|
| mod - src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py |
Diff
File
|
| mod - src/Mod/Fem/femmesh/meshtools.py |
Diff
File
|
| mod - src/Mod/Fem/femsolver/writerbase.py |
Diff
File
|
| mod - src/Mod/Fem/femtest/app/test_ccxtools.py |
Diff
File
|
| mod - src/Mod/Fem/femtest/data/ccx/constraint_contact_solid_solid.inp |
Diff
File
|
| mod - src/Mod/Fem/femtest/data/ccx/mat_multiple.inp |
Diff
File
|
| mod - src/Mod/Fem/femtest/data/ccx/mat_nonlinear.inp |
Diff
File
|
| add - src/Mod/Fem/femtest/data/ccx/thermomech_bimetall.inp |
Diff
File
|
| mod - src/Mod/Fem/femtools/ccxtools.py |
Diff
File
|
| mod - src/Mod/Material/CMakeLists.txt |
Diff
File
|
| mod - src/Mod/Material/FluidMaterial/Air.FCMat |
Diff
File
|
| mod - src/Mod/Material/FluidMaterial/None.FCMat |
Diff
File
|
| add - src/Mod/Material/FluidMaterial/Readme.md |
Diff
File
|
| rm - src/Mod/Material/FluidMaterial/Readme.txt |
Diff
File
|
| mod - src/Mod/Material/FluidMaterial/Water.FCMat |
Diff
File
|
| mod - src/Mod/Mesh/App/Core/MeshKernel.cpp |
Diff
File
|
| mod - src/Mod/Mesh/App/Core/MeshKernel.h |
Diff
File
|
| mod - src/Mod/Part/Gui/Command.cpp |
Diff
File
|
| mod - src/Mod/Path/PathScripts/post/grbl_post.py |
Diff
File
|
| mod - src/Mod/Sketcher/Gui/Command.cpp |
Diff
File
|
| mod - src/Mod/Sketcher/Gui/ViewProviderSketch.cpp |
Diff
File
|
| mod - src/Mod/Sketcher/Gui/Workbench.cpp |
Diff
File
|
| mod - src/Mod/Start/StartPage/LoadMRU.py |
Diff
File
|
| mod - src/Mod/TechDraw/App/DrawViewBalloon.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/Command.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw4.ui |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/DlgPrefsTechDraw5.ui |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/QGIRichAnno.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/QGIRichAnno.h |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/QGVPage.cpp |
Diff
File
|
| mod - src/Mod/TechDraw/Gui/Resources/icons/preferences-techdraw.svg |
Diff
File
|
FreeCAD
