Merge branch 'bug-17994-create-automatic-parcellation-view'
Conflicts:
Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml
Merge branch 'bug-17994-create-automatic-parcellation-view'
Tags None Referenced Files None Subscribers None
Description Merge branch 'bug-17994-create-automatic-parcellation-view' Conflicts:
Details
Event Timeline
Merged Changes
Changes (17)
rMITK3f66c23fd1a8 Modules/DiffusionImaging/Connectomics/Algorithms/BrainParcellation/mitkCostFunctionBase.cppLoading... Modules/DiffusionImaging/Connectomics/Algorithms/BrainParcellation/mitkRandomParcellationGenerator.cppLoading... Modules/DiffusionImaging/Connectomics/Algorithms/BrainParcellation/mitkRandomParcellationGenerator.hLoading... Modules/DiffusionImaging/Connectomics/Algorithms/BrainParcellation/mitkRegionVoxelCounter.cppLoading... Modules/DiffusionImaging/Connectomics/Algorithms/BrainParcellation/mitkRegionVoxelCounter.hLoading... Plugins/org.mitk.gui.qt.diffusionimaging/resources/connectomics/QmitkRandomParcellationIcon.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkRandomParcellationView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkRandomParcellationView.hLoading... |