HomePhabricator
Diffusion MITK a26bef415659

Merge branch 'bug-18647-multilabelsegmentationplugin-integration-2015-11-25'…

Description

Merge branch 'bug-18647-multilabelsegmentationplugin-integration-2015-11-25' into bug-19600-Multilabel-integration

Conflicts:
Modules/Multilabel/autoload/IO/mitkLabelSetImageIO.cpp
Modules/Segmentation/Algorithms/mitkCorrectorAlgorithm.cpp
Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp
Modules/Segmentation/Interactions/mitkSetRegionTool.cpp

Merged Changes