Author |
Committer |
Branch |
Timestamp |
Parent |
Jose Luis Cercos Pita |
Jose Luis Cercos Pita |
master |
2016-01-25 15:26:18 |
master 499c6856 |
Changeset |
Merge remote-tracking branch 'upstream/master' |
mod - src/App/Application.cpp |
Diff
File
|
mod - src/App/PropertyFile.cpp |
Diff
File
|
mod - src/Gui/GuiApplicationNativeEventAware.cpp |
Diff
File
|
mod - src/Gui/GuiApplicationNativeEventAware.h |
Diff
File
|
mod - src/Mod/Complete/App/AppComplete.cpp |
Diff
File
|
rm - src/Mod/Complete/App/AppCompletePy.cpp |
Diff
File
|
mod - src/Mod/Complete/App/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Complete/Gui/AppCompleteGui.cpp |
Diff
File
|
rm - src/Mod/Complete/Gui/AppCompleteGuiPy.cpp |
Diff
File
|
mod - src/Mod/Complete/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Draft/App/AppDraftUtils.cpp |
Diff
File
|
mod - src/Mod/Draft/App/AppDraftUtilsPy.cpp |
Diff
File
|
mod - src/Mod/Draft/DraftGeomUtils.py |
Diff
File
|
mod - src/Mod/Drawing/App/AppDrawing.cpp |
Diff
File
|
mod - src/Mod/Drawing/App/AppDrawingPy.cpp |
Diff
File
|
mod - src/Mod/Drawing/Gui/AppDrawingGui.cpp |
Diff
File
|
mod - src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp |
Diff
File
|
mod - src/Mod/Fem/App/AppFem.cpp |
Diff
File
|
mod - src/Mod/Fem/App/AppFemPy.cpp |
Diff
File
|
mod - src/Mod/Fem/Gui/AppFemGui.cpp |
Diff
File
|
mod - src/Mod/Fem/Gui/AppFemGuiPy.cpp |
Diff
File
|
mod - src/Mod/Image/App/AppImage.cpp |
Diff
File
|
mod - src/Mod/Image/Gui/AppImageGui.cpp |
Diff
File
|
mod - src/Mod/Image/Gui/AppImageGuiPy.cpp |
Diff
File
|
mod - src/Mod/Import/App/AppImport.cpp |
Diff
File
|
mod - src/Mod/Import/App/AppImportPy.cpp |
Diff
File
|
mod - src/Mod/Import/Gui/AppImportGui.cpp |
Diff
File
|
mod - src/Mod/Import/Gui/AppImportGuiPy.cpp |
Diff
File
|
mod - src/Mod/Inspection/App/AppInspection.cpp |
Diff
File
|
mod - src/Mod/Inspection/App/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Inspection/Gui/AppInspectionGui.cpp |
Diff
File
|
mod - src/Mod/Inspection/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Mesh/App/AppMesh.cpp |
Diff
File
|
mod - src/Mod/Mesh/App/AppMeshPy.cpp |
Diff
File
|
mod - src/Mod/Mesh/App/MeshProperties.cpp |
Diff
File
|
mod - src/Mod/Mesh/App/MeshProperties.h |
Diff
File
|
mod - src/Mod/Mesh/Gui/AppMeshGui.cpp |
Diff
File
|
mod - src/Mod/Mesh/Gui/CMakeLists.txt |
Diff
File
|
add - src/Mod/Mesh/Gui/DlgSettingsImportExport.ui |
Diff
File
|
mod - src/Mod/MeshPart/App/AppMeshPart.cpp |
Diff
File
|
mod - src/Mod/MeshPart/App/AppMeshPartPy.cpp |
Diff
File
|
mod - src/Mod/MeshPart/Gui/AppMeshPartGui.cpp |
Diff
File
|
rm - src/Mod/MeshPart/Gui/AppMeshPartGuiPy.cpp |
Diff
File
|
mod - src/Mod/MeshPart/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Part/App/AppPart.cpp |
Diff
File
|
mod - src/Mod/Part/App/AppPartPy.cpp |
Diff
File
|
mod - src/Mod/Part/Gui/AppPartGui.cpp |
Diff
File
|
mod - src/Mod/Part/Gui/Command.cpp |
Diff
File
|
mod - src/Mod/PartDesign/App/AppPartDesign.cpp |
Diff
File
|
mod - src/Mod/PartDesign/App/AppPartDesignPy.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/AppPartDesignGui.cpp |
Diff
File
|
rm - src/Mod/PartDesign/Gui/AppPartDesignGuiPy.cpp |
Diff
File
|
mod - src/Mod/PartDesign/Gui/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Path/App/AppPath.cpp |
Diff
File
|
mod - src/Mod/Path/App/AppPathPy.cpp |
Diff
File
|
mod - src/Mod/Path/CMakeLists.txt |
Diff
File
|
mod - src/Mod/Path/Gui/AppPathGui.cpp |
Diff
File
|
mod - src/Mod/Path/Gui/AppPathGuiPy.cpp |
Diff
File
|
mod - src/Mod/Path/Gui/Resources/Path.qrc |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-Array.svg |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-Custom.svg |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-FacePocket.svg |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-FaceProfile.svg |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-Inspect.svg |
Diff
File
|
mod - src/Mod/Path/Gui/Resources/icons/Path-Pocket.svg |
Diff
File
|
mod - src/Mod/Path/Gui/Resources/icons/Path-Profile.svg |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-SimpleCopy.svg |
Diff
File
|
add - src/Mod/Path/Gui/Resources/icons/Path-ToolChange.svg |
Diff
File
|
add - src/Mod/Path/PathScripts/PathArray.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathCustom.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathFacePocket.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathFaceProfile.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathInspect.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathSimpleCopy.py |
Diff
File
|
add - src/Mod/Path/PathScripts/PathToolChange.py |
Diff
File
|
rm - src/Mod/Robot/App/AppRobotPy.cpp |
Diff
File
|
rm - src/Mod/Robot/Gui/AppRobotGuiPy.cpp |
Diff
File
|
rm - src/Mod/Sketcher/Gui/AppSketcherGuiPy.cpp |
Diff
File
|