HomePhabricator
Diffusion MITK 66a6d060032f

Merge remote-tracking branch 'origin/bug-18647-multilabelsegmentationplugin…

Description

Merge remote-tracking branch 'origin/bug-18647-multilabelsegmentationplugin-integration-2015-11-25' into local/multilabel-plugin-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