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 081b86c2

Diff Back to Repository
Author Committer Branch Timestamp Parent
wwmayer wwmayer master 2016-04-13 10:57:57 master 07e9c5cd
Changeset Merge pull request 0000135 from blobfish/rebaseMaster

PartDesignNext rebased on master
mod - CMakeLists.txt Diff File
add - FCMasterMerge.kdev4 Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Cam_shaft_123_457_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Case_r_123_200_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Cylinder_1_123_100_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Cylinder_2_123_101_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Head_1_123_150_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Head_2_123_151_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Head_Nut_123_005_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Head_Stud_123_006_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Lifter_123_923_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Piston_123_844_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Piston_pin_123_845_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Arm_123_600_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Arm_Shaft_123_601_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Arm_copy_123_602_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Bolt_123_603_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Mount_123_604_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Mount_Cap_123_608_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Spark_Plug__0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Spring_Link__0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Valve_123_700_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Cover_123_701_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Cover_copy__0_Main.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Spring_123_702_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Spring_Cap_123_704_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/cam_gear_123_456_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/crank_123_782_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/crank_gear_123_783_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/cylinder_bolt_pattern__0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine/rod_123_699_0_Parts.jt Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine1_Internals.plmxml Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine2_Externals.plmxml Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine3.plmxml Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine3.xml Diff File
add - data/tests/Jt/Engine/2_Cylinder_Engine3_Exploded.plmxml Diff File
mod - data/tests/PadTest.fcstd Diff File
mod - data/tests/PocketTest.fcstd Diff File
add - data/tests/Step/as1-ac-214_small.stp Diff File
mod - src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp Diff File
mod - src/App/Application.cpp Diff File
mod - src/App/CMakeLists.txt Diff File
mod - src/App/Document.cpp Diff File
mod - src/App/Document.h Diff File
mod - src/App/DocumentObject.cpp Diff File
mod - src/App/DocumentObject.h Diff File
mod - src/App/DocumentObjectGroup.cpp Diff File
mod - src/App/DocumentObjectGroup.h Diff File
mod - src/App/DocumentObjectGroupPy.xml Diff File
mod - src/App/DocumentObjectGroupPyImp.cpp Diff File
mod - src/App/GeoFeature.cpp Diff File
mod - src/App/GeoFeature.h Diff File
add - src/App/GeoFeatureGroup.cpp Diff File
add - src/App/GeoFeatureGroup.h Diff File
add - src/App/GeoFeatureGroupPy.xml Diff File
add - src/App/GeoFeatureGroupPyImp.cpp Diff File
add - src/App/GeoFeaturePy.xml Diff File
add - src/App/GeoFeaturePyImp.cpp Diff File
add - src/App/Origin.cpp Diff File
add - src/App/Origin.h Diff File
add - src/App/OriginFeature.cpp Diff File
add - src/App/OriginFeature.h Diff File
add - src/App/OriginGroup.cpp Diff File
add - src/App/OriginGroup.h Diff File
add - src/App/OriginGroupPy.xml Diff File
add - src/App/OriginGroupPyImp.cpp Diff File
add - src/App/Part.cpp Diff File
add - src/App/Part.h Diff File
add - src/App/PartPy.xml Diff File
add - src/App/PartPyImp.cpp Diff File
mod - src/App/PropertyLinks.cpp Diff File
mod - src/App/PropertyLinks.h Diff File
mod - src/Base/Exception.h Diff File
mod - src/Base/Reader.cpp Diff File
mod - src/Base/RotationPyImp.cpp Diff File
mod - src/Base/Uuid.cpp Diff File
add - src/Gui/ActiveObjectList.cpp Diff File
add - src/Gui/ActiveObjectList.h 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/CMakeLists.txt Diff File
mod - src/Gui/Command.h Diff File
mod - src/Gui/CommandDoc.cpp Diff File
mod - src/Gui/Control.cpp Diff File
add - src/Gui/DAGView/DAGFilter.cpp Diff File
add - src/Gui/DAGView/DAGFilter.h Diff File
add - src/Gui/DAGView/DAGModel.cpp Diff File
add - src/Gui/DAGView/DAGModel.h Diff File
add - src/Gui/DAGView/DAGModelGraph.cpp Diff File
add - src/Gui/DAGView/DAGModelGraph.h Diff File
add - src/Gui/DAGView/DAGRectItem.cpp Diff File
add - src/Gui/DAGView/DAGRectItem.h Diff File
add - src/Gui/DAGView/DAGView.cpp Diff File
add - src/Gui/DAGView/DAGView.h Diff File
add - src/Gui/DAGView/DAGViewerDesign.svg Diff File
add - src/Gui/DlgCheckableMessageBox.cpp Diff File
add - src/Gui/DlgCheckableMessageBox.h Diff File
add - src/Gui/DlgCheckableMessageBox.ui Diff File
mod - src/Gui/Document.cpp Diff File
mod - src/Gui/Document.h Diff File
add - src/Gui/Icons/CoordinateSystem.svg Diff File
add - src/Gui/Icons/dagViewFail.svg Diff File
add - src/Gui/Icons/dagViewPass.svg Diff File
add - src/Gui/Icons/dagViewPending.svg Diff File
add - src/Gui/Icons/dagViewVisible.svg Diff File
mod - src/Gui/Icons/resource.qrc Diff File
mod - src/Gui/Inventor/SoAutoZoomTranslation.cpp Diff File
mod - src/Gui/MDIView.cpp Diff File
mod - src/Gui/MDIView.h Diff File
mod - src/Gui/MainWindow.cpp Diff File
mod - src/Gui/ProjectView.cpp Diff File
mod - src/Gui/ProjectView.h Diff File
mod - src/Gui/Qt4All.h Diff File
mod - src/Gui/Selection.cpp Diff File
mod - src/Gui/Selection.h Diff File
mod - src/Gui/SoFCSelection.cpp Diff File
mod - src/Gui/SoFCSelection.h Diff File
mod - src/Gui/SoFCUnifiedSelection.h Diff File
mod - src/Gui/TaskView/TaskDialog.cpp Diff File
mod - src/Gui/TaskView/TaskDialog.h Diff File
mod - src/Gui/TaskView/TaskView.cpp Diff File
mod - src/Gui/TaskView/TaskWatcher.cpp Diff File
mod - src/Gui/TaskView/TaskWatcher.h Diff File
mod - src/Gui/Tree.cpp Diff File
add - src/Gui/ViewProviderGeoFeatureGroup.cpp Diff File
add - src/Gui/ViewProviderGeoFeatureGroup.h Diff File
add - src/Gui/ViewProviderLine.cpp Diff File
add - src/Gui/ViewProviderLine.h Diff File
add - src/Gui/ViewProviderOrigin.cpp Diff File
add - src/Gui/ViewProviderOrigin.h Diff File
add - src/Gui/ViewProviderOriginFeature.cpp Diff File
add - src/Gui/ViewProviderOriginFeature.h Diff File
add - src/Gui/ViewProviderOriginGroup.cpp Diff File
add - src/Gui/ViewProviderOriginGroup.h Diff File
add - src/Gui/ViewProviderPart.cpp Diff File
add - src/Gui/ViewProviderPart.h Diff File
add - src/Mod/Assembly/App/Constraint.cpp Diff File
add - src/Mod/Assembly/App/Constraint.h Diff File
add - src/Mod/Assembly/App/ConstraintGroup.cpp Diff File
add - src/Mod/Assembly/App/ConstraintGroup.h Diff File
add - src/Mod/Assembly/App/ConstraintGroupPy.xml Diff File
add - src/Mod/Assembly/App/ConstraintGroupPyImp.cpp Diff File
add - src/Mod/Assembly/App/ConstraintPy.xml Diff File
add - src/Mod/Assembly/App/ConstraintPyImp.cpp Diff File
add - src/Mod/Assembly/App/Item.cpp Diff File
add - src/Mod/Assembly/App/Item.h Diff File
add - src/Mod/Assembly/App/ItemPy.xml Diff File
add - src/Mod/Assembly/App/ItemPyImp.cpp Diff File
add - src/Mod/Assembly/App/PartRef.cpp Diff File
add - src/Mod/Assembly/App/PartRef.h Diff File
add - src/Mod/Assembly/App/PartRefPy.xml Diff File
add - src/Mod/Assembly/App/PartRefPyImp.cpp Diff File
add - src/Mod/Assembly/App/Product.cpp Diff File
add - src/Mod/Assembly/App/Product.h Diff File
add - src/Mod/Assembly/App/ProductRef.cpp Diff File
add - src/Mod/Assembly/App/ProductRef.h Diff File
add - src/Mod/Assembly/App/ProductRefPy.xml Diff File
add - src/Mod/Assembly/App/ProductRefPyImp.cpp Diff File
add - src/Mod/Assembly/App/Solver/Solver.h Diff File
add - src/Mod/Assembly/App/Solver/solver_3d_ext1.cpp Diff File
add - src/Mod/Assembly/App/Solver/solver_3d_ext2.cpp Diff File
add - src/Mod/Assembly/App/Solver/solver_3d_ext3.cpp Diff File
add - src/Mod/Assembly/App/Solver/solver_state_ext1.cpp Diff File
add - src/Mod/Assembly/App/Solver/solver_state_ext2.cpp Diff File
add - src/Mod/Assembly/App/opendcm/.kdev_include_paths Diff File
add - src/Mod/Assembly/App/opendcm/core.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/clustergraph.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/constraint.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/defines.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/equations.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/geometry.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/constraint_holder_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/constraint_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/equations_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/geometry_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/kernel_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/object_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/system_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/imp/transformation_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/kernel.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/logging.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/multimap.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/object.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/property.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/sheduler.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/system.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/traits.hpp Diff File
add - src/Mod/Assembly/App/opendcm/core/transformation.hpp Diff File
add - src/Mod/Assembly/App/opendcm/externalize.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/alignment.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/angle.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/clustermath.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/coincident.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/defines.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/distance.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/dof.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/geometry.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/imp/clustermath_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/imp/constraint3d_holder_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/imp/constraint3d_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/imp/geometry3d_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/imp/module_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/imp/solver_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/imp/state_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/module.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/parallel.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/solver.hpp Diff File
add - src/Mod/Assembly/App/opendcm/module3d/state.hpp Diff File
add - src/Mod/Assembly/App/opendcm/modulePart/geometry.hpp Diff File
add - src/Mod/Assembly/App/opendcm/modulePart/module.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleShape3d/defines.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleShape3d/distance.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleShape3d/fixed.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleShape3d/generator.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleShape3d/geometry.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleShape3d/module.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/defines.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/edge_vertex_generator.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/edge_vertex_parser.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/extractor.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/generator.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/edge_vertex_generator_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/edge_vertex_parser_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/generator_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/module_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/object_generator_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/object_parser_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/parser_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/property_generator_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/property_parser_imp.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/imp/traits_impl.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/indent.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/karma_trans.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/module.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/object_generator.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/object_parser.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/parser.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/property_generator.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/property_parser.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleState/traits.hpp Diff File
add - src/Mod/Assembly/App/opendcm/modulepart.hpp Diff File
add - src/Mod/Assembly/App/opendcm/moduleshape3d.hpp Diff File
add - src/Mod/Assembly/App/opendcm/modulestate.hpp Diff File
add - src/Mod/Assembly/AssemblyLib.py Diff File
add - src/Mod/Assembly/DevAssembly.py Diff File
add - src/Mod/Assembly/FCDocTool.py Diff File
add - src/Mod/Assembly/Gui/CommandConstraints.cpp Diff File
add - src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_Existing_Part.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/Assembly_Add_New_Part.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Create_New.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/Assembly_Assembly_Tree.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintAngle.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintBidirectional.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintDistance.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintEqual.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintGeneral.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintLock.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintOpposite.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintParallel.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintPerpendicular.svg Diff File
add - src/Mod/Assembly/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional1.svg Diff File