HomePhabricator
Diffusion MITK b025feae02ab

Merge branch 'bug-18646-integrate_Sebastian_Ordas_multilabel_plugin' into bug…

Description

Merge branch 'bug-18646-integrate_Sebastian_Ordas_multilabel_plugin' into bug-18647-multilabelsegmentationplugin

  1. Conflicts:
  2. Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.cpp
  3. Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.h
  4. Modules/SurfaceInterpolation/CMakeLists.txt
  5. Modules/SurfaceInterpolation/files.cmake
  6. Plugins/PluginList.cmake

Details

Provenance
fetzerAuthored on Aug 18 2015, 1:19 PM
Parents
rMITK9f82c0d26314: Working Correction Tool
rMITK73023cf730d3: Merge branch 'bug-18870-ParallelWeightedPrediction'
Branches
Unknown
Tags
Unknown

Merged Changes