Merge remote-tracking branch 'origin/master' into T26820-slick_segmentation_workbench
- Conflicts:
- Modules/Multilabel/autoload/DICOMSegIO/mitkDICOMSegIOMimeTypes.cpp
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>
Merge remote-tracking branch 'origin/master' into T26820-slick_segmentation_workbench
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>
floca | Authored on Feb 20 2020, 4:36 PM |
floca | Pushed on Mar 2 2020, 10:58 AM |
floca | Pushed on Mar 2 2020, 10:57 AM |