HomePhabricator
Diffusion MITK 487a35666c6c

Merge branch 'bug-16775-live-wire-with-3d-interpolation' into removing…

Description

Merge branch 'bug-16775-live-wire-with-3d-interpolation' into removing-contour-for-3D-interpolation

Conflicts:
Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp
Modules/Segmentation/Interactions/mitkSegTool2D.cpp
Modules/Segmentation/Interactions/mitkSegTool2D.h
Modules/SurfaceInterpolation/Testing/mitkSurfaceInterpolationControllerTest.cpp
Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp
Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Details

Provenance
fetzerAuthored on Aug 13 2014, 2:35 AM
Parents
rMITK42f38aad90c2: Fixed documentation
rMITKf5f8613c88b4: Fixed setting of contour markers.
Branches
Unknown
Tags
Unknown