Merge branch 'master' into T25807-Generalize_PropertyRelationRuleBase
- Conflicts:
- Modules/Core/src/DataManagement/mitkPropertyRelationRuleBase.cpp
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>
Merge branch 'master' into T25807-Generalize_PropertyRelationRuleBase
Tags None Referenced Files None Subscribers None
Description Merge branch 'master' into T25807-Generalize_PropertyRelationRuleBase
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>
Details
Event Timeline
Merged Changes
Changes (113)
rMITK36d1eaf5ac60 Modules/DiffusionImaging/DiffusionCore/src/IODataStructures/Properties/mitkDiffusionPropertyHelper.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging.fiberfox/src/internal/QmitkFiberGenerationView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingView.hLoading... Plugins/org.mitk.gui.qt.diffusionimaging.preprocessing/src/internal/QmitkPreprocessingViewControls.uiLoading... Plugins/org.mitk.gui.qt.diffusionimaging.registration/src/internal/QmitkSimpleRegistrationView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.hLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkImageStatisticsReloaded.doxLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.cppLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.hLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.cppLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedView.hLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsReloadedViewControls.uiLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.uiLoading... |