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 33248f75

Diff Back to Repository
Author Committer Branch Timestamp Parent
Jriegel Jriegel master 2014-01-12 16:23:03 master 11278f34
Changeset Merge branch 'refs/heads/j-downsett-orthos_finished'

Conflicts:
    src/Mod/Drawing/Gui/TaskOrthoViews.cpp
mod - src/Mod/Drawing/App/FeatureViewPart.cpp Diff File
mod - src/Mod/Drawing/App/ProjectionAlgos.cpp Diff File
mod - src/Mod/Drawing/App/ProjectionAlgos.h Diff File
mod - src/Mod/Drawing/Gui/TaskOrthoViews.cpp Diff File
mod - src/Mod/Drawing/Gui/TaskOrthoViews.h Diff File
mod - src/Mod/Drawing/Gui/TaskOrthoViews.ui Diff File
mod - src/Mod/Drawing/Templates/A3_Landscape.svg Diff File
mod - src/Mod/Drawing/Templates/A4_Landscape.svg Diff File