Author |
Committer |
Branch |
Timestamp |
Parent |
jriegel |
jriegel |
master |
2014-09-12 12:27:55 |
master 889e7bbd |
Changeset |
Merge branch 'refs/heads/master' into jriegel/Rift |
mod - CMakeLists.txt |
Diff
File
|
mod - cMake/FindOpenCasCade.cmake |
Diff
File
|
mod - cMake/FreeCadMacros.cmake |
Diff
File
|
mod - cMake/UseLibPack10x.cmake |
Diff
File
|
mod - cMake/UseLibPack9x.cmake |
Diff
File
|
add - src/3rdParty/CxImage/README |
Diff
File
|
mod - src/3rdParty/salomesmesh/CMakeLists.txt |
Diff
File
|
mod - src/3rdParty/salomesmesh/Makefile.am |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMESH_MeshEditor.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMESH_SequenceOfElemPtr.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx |
Diff
File
|
mod - src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp |
Diff
File
|
mod - src/App/Application.cpp |
Diff
File
|
mod - src/App/ComplexGeoData.h |
Diff
File
|
mod - src/App/DocumentObjectPyImp.cpp |
Diff
File
|
mod - src/App/DocumentObserverPython.cpp |
Diff
File
|
mod - src/App/DynamicProperty.cpp |
Diff
File
|
mod - src/App/DynamicProperty.h |
Diff
File
|
mod - src/App/FeaturePython.cpp |
Diff
File
|
mod - src/App/FeaturePython.h |
Diff
File
|
mod - src/App/FeatureTest.cpp |
Diff
File
|
mod - src/App/Property.cpp |
Diff
File
|
mod - src/App/PropertyContainer.cpp |
Diff
File
|
mod - src/App/PropertyContainer.h |
Diff
File
|
mod - src/App/PropertyContainerPy.xml |
Diff
File
|
mod - src/App/PropertyContainerPyImp.cpp |
Diff
File
|
mod - src/App/PropertyGeo.h |
Diff
File
|
mod - src/App/PropertyLinks.cpp |
Diff
File
|
mod - src/App/PropertyLinks.h |
Diff
File
|
mod - src/App/PropertyPythonObject.cpp |
Diff
File
|
mod - src/App/PropertyStandard.h |
Diff
File
|
mod - src/Base/CMakeLists.txt |
Diff
File
|
mod - src/Base/Console.cpp |
Diff
File
|
add - src/Base/CoordinateSystem.cpp |
Diff
File
|
add - src/Base/CoordinateSystem.h |
Diff
File
|
mod - src/Base/FileInfo.cpp |
Diff
File
|
mod - src/Base/Parameter.cpp |
Diff
File
|
mod - src/Base/Quantity.cpp |
Diff
File
|
mod - src/Base/QuantityLexer.c |
Diff
File
|
mod - src/Base/QuantityParser.c |
Diff
File
|
mod - src/Base/QuantityParser.l |
Diff
File
|
mod - src/Base/QuantityParser.y |
Diff
File
|
mod - src/Base/QuantityPy.xml |
Diff
File
|
mod - src/Base/QuantityPyImp.cpp |
Diff
File
|
add - src/Base/StackWalker.cpp |
Diff
File
|
add - src/Base/StackWalker.h |
Diff
File
|
mod - src/Base/UnitsApi.cpp |
Diff
File
|
mod - src/Base/UnitsApi.h |
Diff
File
|
mod - src/Base/UnitsSchemaMKS.cpp |
Diff
File
|
mod - src/CXX/Python2/Objects.hxx |
Diff
File
|
mod - src/Doc/BuildDevDoc.cfg.in |
Diff
File
|
mod - src/Gui/Action.cpp |
Diff
File
|
mod - src/Gui/Action.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/BitmapFactory.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/CommandStd.cpp |
Diff
File
|
mod - src/Gui/CommandView.cpp |
Diff
File
|
mod - src/Gui/CommandWindow.cpp |
Diff
File
|
mod - src/Gui/DlgActionsImp.cpp |
Diff
File
|
mod - src/Gui/DlgCustomizeSpaceball.cpp |
Diff
File
|
mod - src/Gui/DlgCustomizeSpaceball.h |
Diff
File
|
mod - src/Gui/DlgDisplayPropertiesImp.cpp |
Diff
File
|
mod - src/Gui/DlgKeyboardImp.cpp |
Diff
File
|
mod - src/Gui/DlgPreferencesImp.h |
Diff
File
|
mod - src/Gui/Document.cpp |
Diff
File
|
mod - src/Gui/GuiApplicationNativeEventAware.cpp |
Diff
File
|
mod - src/Gui/Icons/Document.svg |
Diff
File
|
add - src/Gui/Icons/preferences-import-export.svg |
Diff
File
|
mod - src/Gui/Icons/resource.qrc |
Diff
File
|
mod - src/Gui/InputField.cpp |
Diff
File
|
mod - src/Gui/InventorAll.h |
Diff
File
|
mod - src/Gui/MainWindow.cpp |
Diff
File
|
mod - src/Gui/ManualAlignment.cpp |
Diff
File
|
mod - src/Gui/MouseSelection.cpp |
Diff
File
|
mod - src/Gui/NavigationStyle.cpp |
Diff
File
|
mod - src/Gui/Placement.cpp |
Diff
File
|
mod - src/Gui/Placement.h |
Diff
File
|
mod - src/Gui/Placement.ui |
Diff
File
|
mod - src/Gui/PropertyView.cpp |
Diff
File
|
add - src/Gui/QuantitySpinBox.cpp |
Diff
File
|
add - src/Gui/QuantitySpinBox.h |
Diff
File
|
mod - src/Gui/SelectionView.cpp |
Diff
File
|
mod - src/Gui/SelectionView.h |
Diff
File
|
mod - src/Gui/SoFCDB.cpp |
Diff
File
|
mod - src/Gui/Splashscreen.cpp |
Diff
File
|
mod - src/Gui/SplitView3DInventor.cpp |
Diff
File
|
mod - src/Gui/SplitView3DInventor.h |
Diff
File
|
mod - src/Gui/TaskPanelView.cpp |
Diff
File
|
mod - src/Gui/TaskPanelView.h |
Diff
File
|
mod - src/Gui/TaskView/TaskAppearance.cpp |
Diff
File
|
mod - src/Gui/Transform.cpp |
Diff
File
|
mod - src/Gui/View3DInventor.cpp |
Diff
File
|
mod - src/Gui/View3DInventor.h |
Diff
File
|
mod - src/Gui/View3DInventorViewer.cpp |
Diff
File
|
mod - src/Gui/View3DInventorViewer.h |
Diff
File
|
mod - src/Gui/ViewProvider.cpp |
Diff
File
|
mod - src/Gui/ViewProvider.h |
Diff
File
|
mod - src/Gui/ViewProviderGeometryObject.cpp |
Diff
File
|
mod - src/Gui/ViewProviderInventorObject.cpp |
Diff
File
|
mod - src/Gui/ViewProviderMeasureDistance.cpp |
Diff
File
|
mod - src/Gui/ViewProviderPythonFeature.cpp |
Diff
File
|
mod - src/Gui/ViewProviderPythonFeature.h |
Diff
File
|
mod - src/Gui/ViewProviderVRMLObject.cpp |
Diff
File
|
mod - src/Gui/Widgets.cpp |
Diff
File
|
mod - src/Gui/Widgets.h |
Diff
File
|
mod - src/Gui/propertyeditor/PropertyItem.cpp |
Diff
File
|
mod - src/Gui/propertyeditor/PropertyItem.h |
Diff
File
|
mod - src/Gui/resource.cpp |
Diff
File
|
mod - src/Main/MainGui.cpp |
Diff
File
|
mod - src/Mod/Arch/Arch.py |
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
|
add - src/Mod/Arch/ArchEquipment.py |
Diff
File
|
mod - src/Mod/Arch/ArchFloor.py |
Diff
File
|
mod - src/Mod/Arch/ArchFrame.py |
Diff
File
|
add - src/Mod/Arch/ArchPanel.py |
Diff
File
|
mod - src/Mod/Arch/ArchRebar.py |
Diff
File
|
mod - src/Mod/Arch/ArchRoof.py |
Diff
File
|
mod - src/Mod/Arch/ArchSectionPlane.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/ArchVRM.py |
Diff
File
|
mod - src/Mod/Arch/ArchWall.py |
Diff
File
|
mod - src/Mod/Arch/ArchWindow.py |
Diff
File
|
mod - src/Mod/Arch/Arch_rc.py |
Diff
File
|
mod - src/Mod/Arch/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Arch/InitGui.py |
Diff
File
|
mod - src/Mod/Arch/Resources/Arch.qrc |
Diff
File
|
add - src/Mod/Arch/Resources/icons/Arch_3Views.svg |
Diff
File
|
add - src/Mod/Arch/Resources/icons/Arch_Equipment.svg |
Diff
File
|
add - src/Mod/Arch/Resources/icons/Arch_Equipment_Tree.svg |
Diff
File
|
add - src/Mod/Arch/Resources/icons/Arch_Panel.svg |
Diff
File
|
add - src/Mod/Arch/Resources/icons/Arch_Panel_Tree.svg |
Diff
File
|
mod - src/Mod/Arch/Resources/ui/archprefs-base.ui |
Diff
File
|
mod - src/Mod/Arch/Resources/ui/archprefs-defaults.ui |
Diff
File
|
mod - src/Mod/Arch/Resources/ui/archprefs-import.ui |
Diff
File
|
rm - src/Mod/Arch/ifcReader.py |
Diff
File
|
rm - src/Mod/Arch/ifcWriter.py |
Diff
File
|
mod - src/Mod/Arch/importIFC.py |
Diff
File
|
add - src/Mod/Arch/importIFClegacy.py |
Diff
File
|
mod - src/Mod/Arch/importWebGL.py |
Diff
File
|
mod - src/Mod/Draft/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Draft/Draft.py |
Diff
File
|
mod - src/Mod/Draft/DraftGeomUtils.py |
Diff
File
|
mod - src/Mod/Draft/DraftTools.py |
Diff
File
|
mod - src/Mod/Draft/DraftTrackers.py |
Diff
File
|
mod - src/Mod/Draft/Draft_rc.py |
Diff
File
|
mod - src/Mod/Draft/InitGui.py |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/userprefs-import1.ui |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/userprefs-import2.ui |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/userprefs-snap.ui |
Diff
File
|
mod - src/Mod/Draft/Resources/ui/userprefs-visual.ui |
Diff
File
|
mod - src/Mod/Draft/WorkingPlane.py |
Diff
File
|
mod - src/Mod/Draft/importDXF.py |
Diff
File
|
rm - src/Mod/Draft/macros.py |
Diff
File
|
mod - src/Mod/Drawing/App/DrawingExport.cpp |
Diff
File
|
mod - src/Mod/Drawing/App/FeaturePage.cpp |
Diff
File
|
mod - src/Mod/Drawing/App/FeatureViewPart.cpp |
Diff
File
|
mod - src/Mod/Drawing/App/ProjectionAlgos.cpp |
Diff
File
|
mod - src/Mod/Drawing/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp |
Diff
File
|
mod - src/Mod/Drawing/Gui/Command.cpp |
Diff
File
|
mod - src/Mod/Drawing/Gui/DrawingView.cpp |
Diff
File
|
mod - src/Mod/Drawing/Gui/DrawingView.h |
Diff
File
|
mod - src/Mod/Drawing/Gui/TaskOrthoViews.cpp |
Diff
File
|
mod - src/Mod/Drawing/Gui/ViewProviderPage.cpp |
Diff
File
|
add - src/Mod/Drawing/Templates/A3_Landscape.dxf |
Diff
File
|
add - src/Mod/Drawing/Templates/A4_Landscape.dxf |
Diff
File
|
add - src/Mod/PartDesign/Gui/Resources/icons/PartDesign_InternalExternalGear.svg |
Diff
File
|
rm - src/Mod/Sandbox/AppSandbox.sln |
Diff
File
|
add - src/Mod/Sandbox/Gui/GLGraphicsView.cpp |
Diff
File
|
add - src/Mod/Sandbox/Gui/GLGraphicsView.h |
Diff
File
|
add - src/Mod/Sandbox/Gui/Overlay.cpp |
Diff
File
|
add - src/Mod/Sandbox/Gui/Overlay.h |
Diff
File
|