Merge branch 'bug-18103-Integration2'
Conflicts:
Modules/DiffusionImaging/MiniApps/files.cmake
Merge branch 'bug-18103-Integration2'
Tags None Referenced Files None Subscribers None
Description Merge branch 'bug-18103-Integration2' Conflicts:
Details
Event Timeline
Merged Changes
Changes (38)
rMITK0ee3c00f9c14 Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cppLoading... Modules/DiffusionImaging/DiffusionCore/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.cppLoading... Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cppLoading... Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.hLoading... Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXWriter.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkOdfMaximaExtractionViewControls.uiLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cppLoading... |