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 c1f0f70b

Diff Back to Repository
Author Committer Branch Timestamp Parent
Jriegel Jriegel master 2014-08-27 15:39:00 master 346e5c6a
Changeset Merge remote-tracking branch 'refs/remotes/origin/jriegel/NewWinBuild' into jriegel/review-NewLibPack

Conflicts:
    src/3rdParty/salomesmesh/CMakeLists.txt
mod - CMakeLists.txt Diff File
add - cMake/UseLibPack10x.cmake Diff File
mod - src/3rdParty/CMakeLists.txt Diff File
mod - src/3rdParty/salomesmesh/CMakeLists.txt Diff File
mod - src/3rdParty/salomesmesh/inc/aptrte.h Diff File
rm - src/3rdParty/salomesmesh/src/MEFISTO2/MEFISTO2F.def Diff File
mod - src/3rdParty/salomesmesh/src/MEFISTO2/aptrte.cpp Diff File
rm - src/3rdParty/salomesmesh/src/MEFISTO2/mefisto.patch Diff File
add - src/3rdParty/salomesmesh/src/MEFISTO2/trte.c Diff File
mod - src/App/FeaturePython.cpp Diff File
mod - src/App/PropertyPythonObject.cpp Diff File
mod - src/Base/Parameter.cpp Diff File
mod - src/CMakeLists.txt Diff File
mod - src/CXX/Python2/Objects.hxx Diff File
mod - src/Doc/CMakeLists.txt Diff File
mod - src/FCConfig.h Diff File
mod - src/Gui/CMakeLists.txt Diff File
mod - src/Gui/MainWindow.cpp Diff File
mod - src/Gui/TaskView/TaskDialogPython.cpp Diff File
mod - src/Gui/ViewProviderPythonFeature.cpp Diff File
mod - src/Main/CMakeLists.txt Diff File
mod - src/Mod/Assembly/App/PreCompiled.h Diff File
mod - src/Mod/Assembly/CMakeLists.txt Diff File
mod - src/Mod/CMakeLists.txt Diff File
mod - src/Mod/Cam/CMakeLists.txt Diff File
mod - src/Mod/Complete/CMakeLists.txt Diff File
mod - src/Mod/Drawing/App/PreCompiled.h Diff File
mod - src/Mod/Drawing/CMakeLists.txt Diff File
mod - src/Mod/Drawing/Gui/TaskOrthoViews.cpp Diff File
mod - src/Mod/Fem/App/CMakeLists.txt Diff File
mod - src/Mod/Fem/CMakeLists.txt Diff File
mod - src/Mod/Fem/Gui/CMakeLists.txt Diff File
mod - src/Mod/Image/App/CMakeLists.txt Diff File
rm - src/Mod/Image/App/CaptureClass.cpp Diff File
mod - src/Mod/Image/CMakeLists.txt Diff File
mod - src/Mod/Image/Gui/CMakeLists.txt Diff File
mod - src/Mod/Image/Gui/Command.cpp Diff File
mod - src/Mod/Image/Gui/Workbench.cpp Diff File
mod - src/Mod/Import/CMakeLists.txt Diff File
mod - src/Mod/Inspection/CMakeLists.txt Diff File
mod - src/Mod/Mesh/App/Core/Approximation.cpp Diff File
mod - src/Mod/Mesh/App/Core/Evaluation.cpp Diff File
mod - src/Mod/Mesh/App/Core/MeshKernel.cpp Diff File
mod - src/Mod/Mesh/App/Core/TopoAlgorithm.cpp Diff File
mod - src/Mod/Mesh/App/Mesh.cpp Diff File
mod - src/Mod/Mesh/CMakeLists.txt Diff File
mod - src/Mod/Mesh/Gui/ViewProviderDefects.cpp Diff File
mod - src/Mod/MeshPart/App/CMakeLists.txt Diff File
mod - src/Mod/MeshPart/CMakeLists.txt Diff File
mod - src/Mod/MeshPart/Gui/CMakeLists.txt Diff File
mod - src/Mod/Part/App/AppPart.cpp Diff File
mod - src/Mod/Part/CMakeLists.txt Diff File
mod - src/Mod/PartDesign/CMakeLists.txt Diff File
mod - src/Mod/Points/App/AppPointsPy.cpp Diff File
mod - src/Mod/Points/App/CMakeLists.txt Diff File
mod - src/Mod/Points/CMakeLists.txt Diff File
mod - src/Mod/Points/Gui/CMakeLists.txt Diff File
mod - src/Mod/Points/Init.py Diff File
mod - src/Mod/Raytracing/CMakeLists.txt Diff File
mod - src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp Diff File
mod - src/Mod/ReverseEngineering/App/CMakeLists.txt Diff File
mod - src/Mod/ReverseEngineering/App/PreCompiled.h Diff File
add - src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp Diff File
mod - src/Mod/ReverseEngineering/CMakeLists.txt Diff File
mod - src/Mod/Robot/CMakeLists.txt Diff File
mod - src/Mod/Sandbox/CMakeLists.txt Diff File
mod - src/Mod/Sketcher/App/Sketch.cpp Diff File
mod - src/Mod/Sketcher/CMakeLists.txt Diff File
mod - src/Mod/Start/CMakeLists.txt Diff File
mod - src/Mod/Test/CMakeLists.txt Diff File
mod - src/Mod/Web/CMakeLists.txt Diff File
mod - src/Tools/_TEMPLATE_/CMakeLists.txt Diff File