HomePhabricator
Diffusion MITK 0be252d301b4

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

Description

Merge branch 'bug-16775-live-wire-with-3d-interpolation' into personal/fetzer/miccai-imic-2014.03

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