Merge branch 'bug-17035-BaseGeometry_IntegrationBranch' into bug-17035-BaseGeometry_IntegrBranch_V2
Conflicts:
Core/Code/DataManagement/mitkImage.h
Core/Code/Rendering/mitkGeometry2DDataMapper2D.h
Merge branch 'bug-17035-BaseGeometry_IntegrationBranch' into bug-17035…
Tags None Referenced Files None Subscribers None
Description Merge branch 'bug-17035-BaseGeometry_IntegrationBranch' into bug-17035-BaseGeometry_IntegrBranch_V2 Conflicts:
Details
Event Timeline
Merged Changes
Changes (311)
rMITK5476c029e17c Modules/DiffusionImaging/DiffusionCore/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.cppLoading... Modules/DiffusionImaging/DiffusionCore/Algorithms/mitkPartialVolumeAnalysisHistogramCalculator.hLoading... Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.hLoading... |