FreeCAD: master 7183cda6

Author Committer Branch Timestamp Parent
Jriegel Jriegel master 2014-08-26 08:42:47 master e4383e8f
Changeset Merge remote-tracking branch 'refs/remotes/origin/wmayer/pcl-testing' into jriegel/NewWinBuild

Conflicts:
    src/Mod/Points/App/CMakeLists.txt
    src/Mod/ReverseEngineering/App/AppReverseEngineeringPy.cpp
mod - CMakeLists.txt Diff File
mod - src/Mod/Points/App/AppPointsPy.cpp 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
add - src/Mod/ReverseEngineering/App/SurfaceTriangulation.h Diff File