Author |
Committer |
Branch |
Timestamp |
Parent |
mlampert |
GitHub |
master |
2019-12-19 02:19:42 |
master 5df4bbf2 |
Changeset |
Merge branch 'master' into feature/toggle-active-cmd-support-for-dressups |
mod - src/App/ApplicationPy.cpp |
Diff
File
|
mod - src/App/FreeCADInit.py |
Diff
File
|
mod - src/Base/FileInfo.h |
Diff
File
|
mod - src/Base/Persistence.h |
Diff
File
|
mod - src/Base/PyExport.h |
Diff
File
|
mod - src/Gui/DAGView/DAGModel.h |
Diff
File
|
mod - src/Gui/DlgPreferencesImp.h |
Diff
File
|
rm - src/Gui/Icons/CoordinateSystem.svg |
Diff
File
|
mod - src/Gui/Icons/Std_CoordinateSystem.svg |
Diff
File
|
add - src/Gui/Icons/Std_CoordinateSystem_alt.svg |
Diff
File
|
add - src/Gui/Icons/Std_Placement.svg |
Diff
File
|
mod - src/Gui/Icons/resource.qrc |
Diff
File
|
mod - src/Gui/ViewProviderPlacement.cpp |
Diff
File
|
mod - src/Mod/AddonManager/Resources/icons/Manipulator_workbench_icon.svg |
Diff
File
|
mod - src/Mod/AddonManager/addonmanager_workers.py |
Diff
File
|
mod - src/Mod/Arch/exportIFC.py |
Diff
File
|
mod - src/Mod/Arch/exportIFCHelper.py |
Diff
File
|
mod - src/Mod/Cam/App/SpringbackCorrection.cpp |
Diff
File
|
mod - src/Mod/Draft/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Draft/Draft.py |
Diff
File
|
mod - src/Mod/Draft/TestDraft.py |
Diff
File
|
add - src/Mod/Draft/drafttests/__init__.py |
Diff
File
|
add - src/Mod/Draft/drafttests/auxiliary.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_airfoildat.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_creation.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_dwg.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_dxf.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_import.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_import_gui.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_import_tools.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_modification.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_oca.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_pivy.py |
Diff
File
|
add - src/Mod/Draft/drafttests/test_svg.py |
Diff
File
|
mod - src/Mod/Fem/coding_conventions.md |
Diff
File
|
mod - src/Mod/Fem/femguiobjects/FemSelectionWidgets.py |
Diff
File
|
mod - src/Mod/Fem/femmesh/gmshtools.py |
Diff
File
|
mod - src/Mod/Fem/femobjects/_FemMeshGmsh.py |
Diff
File
|
mod - src/Mod/Fem/femsolver/elmer/equations/equation.py |
Diff
File
|
mod - src/Mod/Fem/femsolver/run.py |
Diff
File
|
mod - src/Mod/Fem/femtest/data/elmer/group_mesh.geo |
Diff
File
|
mod - src/Mod/Fem/femtools/femutils.py |
Diff
File
|
mod - src/Mod/Import/stepZ.py |
Diff
File
|
mod - src/Mod/Mesh/App/Core/Iterator.h |
Diff
File
|
mod - src/Mod/Mesh/Gui/ViewProvider.cpp |
Diff
File
|
mod - src/Mod/Mesh/Gui/ViewProviderDefects.cpp |
Diff
File
|
mod - src/Mod/MeshPart/App/AppMeshPartPy.cpp |
Diff
File
|
mod - src/Mod/OpenSCAD/OpenSCADCommands.py |
Diff
File
|
mod - src/Mod/Part/App/TopoShapePyImp.cpp |
Diff
File
|
mod - src/Mod/PartDesign/App/FeatureDraft.cpp |
Diff
File
|
mod - src/Mod/Path/Tools/README.md |
Diff
File
|
mod - src/Mod/Sandbox/exportDRAWEXE.py |
Diff
File
|
mod - src/Mod/Sketcher/Gui/Resources/icons/Constraint_Parallel.svg |
Diff
File
|
mod - src/Mod/Sketcher/Gui/Resources/icons/small/Constraint_Parallel_sm.xpm |
Diff
File
|
add - src/Mod/Sketcher/Gui/Resources/icons/small/README.md |
Diff
File
|
mod - src/Mod/Spreadsheet/Gui/SpreadsheetDelegate.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/AppTechDraw.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/CMakeLists.txt |
Diff
File
|
mod - src/Mod/TechDraw/App/CenterLinePy.xml |
Diff
File
|
mod - src/Mod/TechDraw/App/CenterLinePyImp.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/Cosmetic.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/Cosmetic.h |
Diff
File
|
mod - src/Mod/TechDraw/App/CosmeticEdgePy.xml |
Diff
File
|
mod - src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp |
Diff
File
|
add - src/Mod/TechDraw/App/CosmeticExtension.cpp |
Diff
File
|
add - src/Mod/TechDraw/App/CosmeticExtension.h |
Diff
File
|
add - src/Mod/TechDraw/App/CosmeticExtensionPy.xml |
Diff
File
|
add - src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/CosmeticVertexPy.xml |
Diff
File
|
mod - src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawDimHelper.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewDimension.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewPart.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewPart.h |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewPartPy.xml |
Diff
File
|
mod - src/Mod/TechDraw/App/DrawViewPartPyImp.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/Geometry.h |
Diff
File
|
mod - src/Mod/TechDraw/App/GeometryObject.cpp |
Diff
File
|
mod - src/Mod/TechDraw/App/GeometryObject.h |
Diff
File
|
mod - src/Mod/TechDraw/App/PropertyCosmeticEdgeList.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/AppTechDrawGui.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Mod/TechDraw/Gui/CommandAnnotate.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/QGIFace.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIFace.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/QGIViewPart.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGIViewSection.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGVPage.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/QGVPage.h |
Diff
File
|
mod - src/Mod/TechDraw/Gui/TaskCenterLine.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/TaskLineDecor.cpp |
Diff
File
|
mod - src/Mod/TechDraw/Gui/TaskSectionView.cpp |
Diff
File
|
add - src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp |
Diff
File
|
add - src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h |
Diff
File
|
mod - src/Tools/MakeApp.py |
Diff
File
|
mod - src/Tools/fcbt/CreateModule.py |
Diff
File
|
mod - src/Tools/fcbt/CreatePyModule.py |
Diff
File
|