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 1d2c3927

Diff Back to Repository
Author Committer Branch Timestamp Parent
Dan Falck Dan Falck master 2016-12-23 02:09:26 master c84e7662
Changeset Merge branch 'master' into tledit_units
mod - src/3rdParty/salomesmesh/src/SMESHDS/SMESHDS_SubMesh.cpp Diff File
mod - src/App/PropertyFile.cpp Diff File
mod - src/Base/Unit.cpp Diff File
mod - src/Base/Unit.h Diff File
mod - src/Base/UnitsSchemaCentimeters.cpp Diff File
mod - src/Base/UnitsSchemaInternal.cpp Diff File
mod - src/Base/UnitsSchemaMKS.cpp Diff File
mod - src/Gui/CommandView.cpp Diff File
mod - src/Gui/DlgUnitsCalculatorImp.cpp Diff File
mod - src/Gui/MDIView.cpp Diff File
mod - src/Gui/MainWindow.cpp Diff File
mod - src/Gui/ProgressBar.h Diff File
mod - src/Gui/Selection.cpp Diff File
mod - src/Gui/TextEdit.cpp Diff File
mod - src/Gui/View3DInventor.cpp Diff File
mod - src/Gui/ViewProvider.cpp Diff File
mod - src/Gui/ViewProvider.h Diff File
mod - src/Gui/ViewProviderGroupExtension.cpp Diff File
mod - src/Gui/ViewProviderPythonFeature.h Diff File
mod - src/Gui/Workbench.cpp Diff File
mod - src/Gui/propertyeditor/PropertyItem.cpp Diff File
mod - src/Gui/propertyeditor/PropertyItem.h Diff File
mod - src/Gui/propertyeditor/PropertyModel.cpp Diff File
mod - src/Mod/Arch/importOBJ.py Diff File
mod - src/Mod/Draft/Draft.py Diff File
mod - src/Mod/Draft/DraftGeomUtils.py Diff File
mod - src/Mod/Fem/App/AppFem.cpp Diff File
mod - src/Mod/Fem/App/CMakeLists.txt Diff File
mod - src/Mod/Fem/App/FemConstraintHeatflux.cpp Diff File
mod - src/Mod/Fem/App/FemConstraintHeatflux.h Diff File
mod - src/Mod/Fem/App/FemConstraintTemperature.cpp Diff File
mod - src/Mod/Fem/App/FemConstraintTemperature.h Diff File
mod - src/Mod/Fem/App/FemPostFilter.cpp Diff File
mod - src/Mod/Fem/App/FemPostFilter.h Diff File
mod - src/Mod/Fem/CMakeLists.txt Diff File
mod - src/Mod/Fem/FemBeamSection.py Diff File
mod - src/Mod/Fem/FemCommands.py Diff File
mod - src/Mod/Fem/FemGmshTools.py Diff File
mod - src/Mod/Fem/FemInputWriterCcx.py Diff File
mod - src/Mod/Fem/FemInputWriterZ88.py Diff File
add - src/Mod/Fem/FemMeshRegion.py Diff File
mod - src/Mod/Fem/FemMeshTools.py Diff File
mod - src/Mod/Fem/Gui/AppFemGui.cpp Diff File
mod - src/Mod/Fem/Gui/CMakeLists.txt Diff File
mod - src/Mod/Fem/Gui/Command.cpp Diff File
mod - src/Mod/Fem/Gui/Resources/Fem.qrc Diff File
add - src/Mod/Fem/Gui/Resources/icons/fem-DataAlongLine.png Diff File
add - src/Mod/Fem/Gui/Resources/icons/fem-femmesh-region.svg Diff File
add - src/Mod/Fem/Gui/Resources/icons/fem-linearizedstresses.svg Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintHeatflux.h Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintHeatflux.ui Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintTemperature.h Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintTemperature.ui Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp Diff File
mod - src/Mod/Fem/Gui/TaskFemConstraintTransform.h Diff File
mod - src/Mod/Fem/Gui/TaskPostBoxes.cpp Diff File
mod - src/Mod/Fem/Gui/TaskPostBoxes.h Diff File
add - src/Mod/Fem/Gui/TaskPostDataAlongLine.ui Diff File
mod - src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp Diff File
mod - src/Mod/Fem/Gui/ViewProviderFemPostFilter.h Diff File
mod - src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp Diff File
mod - src/Mod/Fem/Gui/Workbench.cpp Diff File
mod - src/Mod/Fem/Gui/Workbench.h Diff File
mod - src/Mod/Fem/InitGui.py Diff File
mod - src/Mod/Fem/TaskPanelFemBeamSection.ui Diff File
mod - src/Mod/Fem/TaskPanelFemMeshGmsh.ui Diff File
add - src/Mod/Fem/TaskPanelFemMeshRegion.ui Diff File
mod - src/Mod/Fem/TaskPanelFemShellThickness.ui Diff File
mod - src/Mod/Fem/TaskPanelMechanicalMaterial.ui Diff File
add - src/Mod/Fem/_CommandMeshRegion.py Diff File
mod - src/Mod/Fem/_FemBeamSection.py Diff File
mod - src/Mod/Fem/_FemMeshGmsh.py Diff File
add - src/Mod/Fem/_FemMeshRegion.py Diff File
mod - src/Mod/Fem/_TaskPanelFemBeamSection.py Diff File
mod - src/Mod/Fem/_TaskPanelFemMeshGmsh.py Diff File
add - src/Mod/Fem/_TaskPanelFemMeshRegion.py Diff File
mod - src/Mod/Fem/_TaskPanelFemShellThickness.py Diff File
mod - src/Mod/Fem/_TaskPanelMechanicalMaterial.py Diff File
mod - src/Mod/Fem/_ViewProviderFemMeshGmsh.py Diff File
add - src/Mod/Fem/_ViewProviderFemMeshRegion.py Diff File
mod - src/Mod/Image/Gui/ImageView.cpp Diff File
mod - src/Mod/OpenSCAD/OpenSCAD2Dgeom.py Diff File
mod - src/Mod/Part/BOPTools/GeneralFuseResult.py Diff File
mod - src/Mod/Part/BOPTools/JoinAPI.py Diff File
mod - src/Mod/Part/BOPTools/JoinFeatures.py Diff File
mod - src/Mod/Part/BOPTools/ShapeMerge.py Diff File
mod - src/Mod/Part/BOPTools/SplitAPI.py Diff File
mod - src/Mod/Part/BOPTools/SplitFeatures.py Diff File
mod - src/Mod/Part/BOPTools/Utils.py Diff File
mod - src/Mod/Part/BOPTools/__init__.py Diff File
mod - src/Mod/Part/Gui/ViewProviderBoolean.cpp Diff File
mod - src/Mod/Part/Gui/ViewProviderBoolean.h Diff File
mod - src/Mod/Path/CMakeLists.txt Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-3DSurface.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Array.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Axis.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-BaseGeometry.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Comment.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Compound.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Contour.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Copy.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Custom.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Datums.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Depths.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Dressup.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Drilling.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Engrave.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Face.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-FacePocket.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-FaceProfile.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Heights.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Holding.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Hop.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Inspect.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Job.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Kurve.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-LengthOffset.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-LoadTool.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Machine-test1.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Machine.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-MachineLathe.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-MachineMill.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-OperationA.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-OperationB.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Plane.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Pocket.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Post.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Profile-Edges.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Profile-Face.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Profile.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Sanity.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-SelectLoop.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Shape.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-SimpleCopy.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Speed.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Stock.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Stop.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Tags.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-ToolChange.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-ToolTable.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/Path-Toolpath.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/PathWorkbench.svg Diff File
mod - src/Mod/Path/Gui/Resources/icons/preferences-path.svg Diff File
mod - src/Mod/Path/InitGui.py Diff File
mod - src/Mod/Path/PathScripts/PathGeom.py Diff File