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

Diff Back to Repository
Author Committer Branch Timestamp Parent
jriegel jriegel master 2014-11-22 13:51:04 master 6483c66c
Changeset Merge branch 'refs/heads/master' into review-CL-Bundler

Conflicts:
    src/3rdParty/salomesmesh/CMakeLists.txt
mod - CMakeLists.txt Diff File
mod - src/3rdParty/salomesmesh/CMakeLists.txt Diff File
mod - src/Gui/ApplicationPy.cpp Diff File
mod - src/Gui/Document.cpp Diff File
mod - src/Gui/WidgetFactory.cpp Diff File
mod - src/Mod/Arch/Arch.py Diff File
mod - src/Mod/Arch/ArchCommands.py Diff File
add - src/Mod/Arch/ArchCutPlane.py Diff File
mod - src/Mod/Arch/ArchWindow.py Diff File
mod - src/Mod/Arch/CMakeLists.txt Diff File
mod - src/Mod/Mesh/App/Core/MeshIO.cpp Diff File
mod - src/Mod/Mesh/App/Core/MeshKernel.cpp Diff File
mod - src/Mod/Mesh/Gui/ViewProvider.cpp Diff File
mod - src/Mod/MeshPart/App/CurveProjector.cpp Diff File
mod - src/Mod/Part/App/PrimitiveFeature.cpp Diff File
mod - src/Mod/Part/Gui/DlgPrimitives.cpp Diff File
mod - src/Mod/PartDesign/CMakeLists.txt Diff File
mod - src/Mod/Plot/CMakeLists.txt Diff File
mod - src/Mod/ReverseEngineering/Gui/Command.cpp Diff File
mod - src/Mod/Ship/CMakeLists.txt Diff File
mod - src/Mod/Sketcher/App/SketchObject.cpp Diff File
mod - src/Mod/Sketcher/Gui/CommandCreateGeo.cpp Diff File
mod - src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp Diff File
mod - src/Mod/Sketcher/Gui/TaskDlgEditSketch.h Diff File
mod - src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp Diff File
mod - src/Mod/Sketcher/Gui/ViewProviderSketch.cpp Diff File