Author |
Committer |
Branch |
Timestamp |
Parent |
triplus |
GitHub |
master |
2016-10-23 16:29:33 |
master 07971aa4 |
Changeset |
Merge branch 'master' into master |
mod - .travis.yml |
Diff
File
|
mod - CMakeLists.txt |
Diff
File
|
mod - cMake/FindNETGEN.cmake |
Diff
File
|
mod - src/3rdParty/salomesmesh/CMakeLists.txt |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/NETGENPlugin_Mesher.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMDS_BallElement.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMDS_LinearEdge.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMDS_MeshCell.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMESH_OctreeNode.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/utilities.h |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/SMESH/MED_V2_2_Wrapper.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/SMESH/SMESH_Gen.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/SMESH/SMESH_OctreeNode.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/SMESH/libmesh.c |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Projection_2D.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cpp |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_ViscousLayers.cpp |
Diff
File
|
mod - src/App/Application.cpp |
Diff
File
|
mod - src/App/Application.h |
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
|
add - src/App/DocumentObjectExtension.cpp |
Diff
File
|
add - src/App/DocumentObjectExtension.h |
Diff
File
|
add - src/App/DocumentObjectExtensionPy.xml |
Diff
File
|
add - src/App/DocumentObjectExtensionPyImp.cpp |
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/DocumentObjectPy.xml |
Diff
File
|
mod - src/App/DynamicProperty.cpp |
Diff
File
|
add - src/App/Extension.cpp |
Diff
File
|
add - src/App/Extension.h |
Diff
File
|
add - src/App/ExtensionContainer.cpp |
Diff
File
|
add - src/App/ExtensionContainer.h |
Diff
File
|
add - src/App/ExtensionContainerPy.xml |
Diff
File
|
add - src/App/ExtensionContainerPyImp.cpp |
Diff
File
|
add - src/App/ExtensionPy.xml |
Diff
File
|
add - src/App/ExtensionPyImp.cpp |
Diff
File
|
add - src/App/GroupExtension.cpp |
Diff
File
|
add - src/App/GroupExtension.h |
Diff
File
|
add - src/App/GroupExtensionPy.xml |
Diff
File
|
add - src/App/GroupExtensionPyImp.cpp |
Diff
File
|
mod - src/App/Part.cpp |
Diff
File
|
mod - src/App/Part.h |
Diff
File
|
mod - src/App/PartPy.xml |
Diff
File
|
mod - src/App/PreCompiled.h |
Diff
File
|
mod - src/App/PropertyContainer.cpp |
Diff
File
|
mod - src/App/PropertyContainer.h |
Diff
File
|
mod - src/App/PropertyLinks.cpp |
Diff
File
|
mod - src/App/TransactionalObject.cpp |
Diff
File
|
mod - src/App/TransactionalObject.h |
Diff
File
|
mod - src/Base/BaseClass.h |
Diff
File
|
mod - src/Gui/Application.cpp |
Diff
File
|
mod - src/Gui/ApplicationPy.cpp |
Diff
File
|
mod - src/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Gui/Command.cpp |
Diff
File
|
mod - src/Gui/Command.h |
Diff
File
|
mod - src/Gui/CommandDoc.cpp |
Diff
File
|
mod - src/Gui/CommandView.cpp |
Diff
File
|
mod - src/Gui/CommandWindow.cpp |
Diff
File
|
mod - src/Gui/DlgPreferences.ui |
Diff
File
|
mod - src/Gui/DlgPreferencesImp.cpp |
Diff
File
|
mod - src/Gui/DocumentModel.cpp |
Diff
File
|
mod - src/Gui/FileDialog.cpp |
Diff
File
|
mod - src/Gui/FileDialog.h |
Diff
File
|
mod - src/Gui/GuiApplication.cpp |
Diff
File
|
mod - src/Gui/MainWindow.cpp |
Diff
File
|
mod - src/Gui/PreCompiled.h |
Diff
File
|
mod - src/Gui/QuantitySpinBox.cpp |
Diff
File
|
mod - src/Gui/ReportView.cpp |
Diff
File
|
mod - src/Gui/Selection.cpp |
Diff
File
|
mod - src/Gui/Selection.h |
Diff
File
|
mod - src/Gui/SelectionObject.cpp |
Diff
File
|
mod - src/Gui/SelectionObject.h |
Diff
File
|
mod - src/Gui/SoFCCSysDragger.cpp |
Diff
File
|
mod - src/Gui/SoFCCSysDragger.h |
Diff
File
|
mod - src/Gui/TaskCSysDragger.cpp |
Diff
File
|
mod - src/Gui/Tree.cpp |
Diff
File
|
mod - src/Gui/Tree.h |
Diff
File
|
mod - src/Gui/View3DInventorViewer.cpp |
Diff
File
|
mod - src/Gui/ViewProvider.cpp |
Diff
File
|
mod - src/Gui/ViewProvider.h |
Diff
File
|
mod - src/Gui/ViewProviderDocumentObject.cpp |
Diff
File
|
mod - src/Gui/ViewProviderDocumentObject.h |
Diff
File
|
mod - src/Gui/ViewProviderDocumentObjectGroup.cpp |
Diff
File
|
mod - src/Gui/ViewProviderDocumentObjectGroup.h |
Diff
File
|
add - src/Gui/ViewProviderExtension.cpp |
Diff
File
|
add - src/Gui/ViewProviderExtension.h |
Diff
File
|
mod - src/Gui/ViewProviderGeoFeatureGroup.cpp |
Diff
File
|
mod - src/Gui/ViewProviderGeoFeatureGroup.h |
Diff
File
|
add - src/Gui/ViewProviderGeoFeatureGroupExtension.cpp |
Diff
File
|
add - src/Gui/ViewProviderGeoFeatureGroupExtension.h |
Diff
File
|
add - src/Gui/ViewProviderGroupExtension.cpp |
Diff
File
|
add - src/Gui/ViewProviderGroupExtension.h |
Diff
File
|
mod - src/Gui/ViewProviderOriginGroup.cpp |
Diff
File
|
mod - src/Gui/ViewProviderOriginGroup.h |
Diff
File
|
add - src/Gui/ViewProviderOriginGroupExtension.cpp |
Diff
File
|
add - src/Gui/ViewProviderOriginGroupExtension.h |
Diff
File
|
mod - src/Gui/ViewProviderPart.cpp |
Diff
File
|
mod - src/Gui/ViewProviderPart.h |
Diff
File
|
mod - src/Gui/WidgetFactory.cpp |
Diff
File
|
mod - src/Gui/propertyeditor/PropertyItem.cpp |
Diff
File
|
mod - src/Main/MainCmd.cpp |
Diff
File
|
mod - src/Main/MainGui.cpp |
Diff
File
|
mod - src/Mod/Arch/ArchAxis.py |
Diff
File
|
mod - src/Mod/Arch/ArchBuilding.py |
Diff
File
|
mod - src/Mod/Arch/ArchCommands.py |
Diff
File
|
mod - src/Mod/Arch/ArchComponent.py |
Diff
File
|
mod - src/Mod/Arch/ArchEquipment.py |
Diff
File
|
mod - src/Mod/Arch/ArchFloor.py |
Diff
File
|
mod - src/Mod/Arch/ArchFrame.py |
Diff
File
|
mod - src/Mod/Arch/ArchPanel.py |
Diff
File
|
mod - src/Mod/Arch/ArchPipe.py |
Diff
File
|
mod - src/Mod/Arch/ArchPrecast.py |
Diff
File
|
mod - src/Mod/Arch/ArchProfile.py |
Diff
File
|
mod - src/Mod/Arch/ArchRebar.py |
Diff
File
|
mod - src/Mod/Arch/ArchRoof.py |
Diff
File
|
mod - src/Mod/Arch/ArchSchedule.py |
Diff
File
|
mod - src/Mod/Arch/ArchSectionPlane.py |
Diff
File
|
mod - src/Mod/Arch/ArchServer.py |
Diff
File
|
mod - src/Mod/Arch/ArchSite.py |
Diff
File
|
mod - src/Mod/Arch/ArchSpace.py |
Diff
File
|
mod - src/Mod/Arch/ArchStairs.py |
Diff
File
|
mod - src/Mod/Arch/ArchStructure.py |
Diff
File
|
mod - src/Mod/Arch/ArchWall.py |
Diff
File
|
mod - src/Mod/Arch/ArchWindow.py |
Diff
File
|
mod - src/Mod/Arch/InitGui.py |
Diff
File
|
mod - src/Mod/Arch/Resources/ui/ArchSchedule.ui |
Diff
File
|
mod - src/Mod/Arch/importGBXML.py |
Diff
File
|
mod - src/Mod/Arch/importIFC.py |
Diff
File
|
mod - src/Mod/Draft/Draft.py |
Diff
File
|
mod - src/Mod/Draft/DraftGeomUtils.py |
Diff
File
|
mod - src/Mod/Draft/DraftGui.py |
Diff
File
|
mod - src/Mod/Draft/DraftSnap.py |
Diff
File
|
mod - src/Mod/Draft/DraftTools.py |
Diff
File
|
mod - src/Mod/Drawing/Gui/TaskOrthoViews.cpp |
Diff
File
|
mod - src/Mod/Fem/App/FemMeshPyImp.cpp |
Diff
File
|
mod - src/Mod/Fem/FemInputWriter.py |
Diff
File
|
mod - src/Mod/Fem/FemInputWriterCcx.py |
Diff
File
|
mod - src/Mod/Fem/FemMeshTools.py |
Diff
File
|
mod - src/Mod/Fem/Gui/Command.cpp |
Diff
File
|
mod - src/Mod/Fem/Gui/TaskDlgMeshShapeNetgen.cpp |
Diff
File
|
mod - src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp |
Diff
File
|
mod - src/Mod/Fem/Gui/TaskFemConstraintPressure.h |
Diff
File
|
mod - src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp |
Diff
File
|
mod - src/Mod/Fem/test_files/ccx/cube_static.inp |
Diff
File
|
mod - src/Mod/Inspection/Gui/ViewProviderInspection.cpp |
Diff
File
|
mod - src/Mod/Mesh/Gui/Command.cpp |
Diff
File
|
mod - src/Mod/OpenSCAD/importCSG.py |
Diff
File
|
mod - src/Mod/Part/App/Attacher.cpp |
Diff
File
|
mod - src/Mod/Part/App/Geometry.cpp |
Diff
File
|
mod - src/Mod/Part/App/Geometry.h |
Diff
File
|
mod - src/Mod/Part/App/GeometryCurvePyImp.cpp |
Diff
File
|
mod - src/Mod/Part/App/GeometrySurfacePy.xml |
Diff
File
|
mod - src/Mod/Part/App/GeometrySurfacePyImp.cpp |
Diff
File
|
mod - src/Mod/Part/App/OffsetSurfacePy.xml |
Diff
File
|
mod - src/Mod/Part/App/OffsetSurfacePyImp.cpp |
Diff
File
|
mod - src/Mod/Part/App/PartFeaturePy.xml |
Diff
File
|
mod - src/Mod/Part/App/PartFeaturePyImp.cpp |
Diff
File
|
mod - src/Mod/Part/App/PlateSurfacePy.xml |
Diff
File
|
mod - src/Mod/Part/App/PlateSurfacePyImp.cpp |
Diff
File
|
mod - src/Mod/Part/App/SurfaceOfExtrusionPy.xml |
Diff
File
|
mod - src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp |
Diff
File
|
mod - src/Mod/Part/App/TopoShapeVertexPyImp.cpp |
Diff
File
|
mod - src/Mod/Part/App/TopoShapeWirePy.xml |
Diff
File
|
mod - src/Mod/Part/App/TopoShapeWirePyImp.cpp |
Diff
File
|
mod - src/Mod/Part/Gui/DlgImportExportStep.ui |
Diff
File
|
mod - src/Mod/Part/Gui/DlgSettingsGeneral.cpp |
Diff
File
|
mod - src/Mod/Part/Gui/ViewProviderBoolean.cpp |
Diff
File
|
mod - src/Mod/Part/Gui/ViewProviderCurveNet.cpp |
Diff
File
|
mod - src/Mod/Part/Gui/ViewProviderMirror.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/Command.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/ReferenceSelection.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/ReferenceSelection.h |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskDatumParameters.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskPrimitiveParameters.ui |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskScaledParameters.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/TaskTransformedParameters.h |
Diff
File
|
mod - src/Mod/PartDesign/Gui/Utils.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/ViewProviderDatum.cpp |
Diff
File
|
mod - src/Mod/Path/App/AppPathPy.cpp |
Diff
File
|
mod - src/Mod/Path/App/PreCompiled.h |
Diff
File
|
mod - src/Mod/Path/CMakeLists.txt |
Diff
File
|
add - src/Mod/Path/Gui/DlgJobChooser.ui |
Diff
File
|
mod - src/Mod/Path/Gui/Resources/Path.qrc |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-Contour.svg |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/ContourEdit.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/DlgJobChooser.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/DlgToolCopy.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/DogboneEdit.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/JobEdit.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui |
Diff
File
|
mod - src/Mod/Path/Gui/Resources/panels/ToolControl.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/ToolEdit.ui |
Diff
File
|
add - src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui |
Diff
File
|
mod - src/Mod/Path/Gui/TaskDlgPathCompound.ui |
Diff
File
|
mod - src/Mod/Path/InitGui.py |
Diff
File
|
add - src/Mod/Path/PathCommands.py |
Diff
File
|
add - src/Mod/Path/PathScripts/DlgToolLibrary.ui |
Diff
File
|
add - src/Mod/Path/PathScripts/DlgToolTableEditor.ui |
Diff
File
|
add - src/Mod/Path/PathScripts/DogboneDressup.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/DragknifeDressup.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathArray.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathComment.py |
Diff
File
|
mod - src/Mod/Path/PathScripts/PathCompoundExtended.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathContour.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathJob.py |
Diff
File
|
rm - src/Mod/Path/PathScripts/PathMachine.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathProfileEdges.py |
Diff
File
|
rm - src/Mod/Path/PathScripts/PathProject.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathStrategy.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathToolLibraryManager.py |
Diff
File
|
add - src/Mod/Path/PathScripts/ToolAdd.ui |
Diff
File
|
add - src/Mod/Path/PathScripts/toollibrarymanager.py |
Diff
File
|