Merge branch 'master' into bug-18261-MakePluginsCompatibleToQt5
Conflicts:
Applications/PluginGenerator/CMakeLists.txt
CMakeExternals/Eigen.cmake
Merge branch 'master' into bug-18261-MakePluginsCompatibleToQt5
Tags None Referenced Files None Subscribers None
Description Merge branch 'master' into bug-18261-MakePluginsCompatibleToQt5 Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (300) Very Large CommitThis commit is very large. Load each file individually.
rMITK9d587edcfd81 Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkOrientationDistributionFunction.txxModules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/mitkTeemDiffusionTensor3DReconstructionImageFilter.cppModules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriter.cppModules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkNrrdDiffusionImageWriter.hPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Connectomics/ConnectomicsManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Connectomics/QmitkRandomParcellationIcon.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/QmitkDiffusionImagingDataImportPage.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/DirectionExtractionFib.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/DirectionExtractionPeaks.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/Fiberfox-Fiducial.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/FiberfoxExamples.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberExtractionViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberProcessingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberfoxViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFieldmapGeneratorViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkGibbsTrackingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkStochasticTrackingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkStreamlineTrackingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/fieldmapGenerator.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/gibbstrackingview.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/gibbstrackingviewadvanced.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/stochastictrackingview.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/streamlinetrackingview.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDenoisingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingPreprocessingPage.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingReconstruction.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingRegistration.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingVisualization.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkOdfDetailsViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkOdfMaximaExtractionViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/registration_basic.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/registration_batch.pngPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingPortalPage.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberExtractionViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFieldmapGeneratorViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfMaximaExtractionViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkPartialVolumeAnalysisViewManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStochasticTrackingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkDiffusionImagingQuantificationPage.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkPartialVolumeAnalysisViewManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkTbssViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkUserIVIMViewManual.dox |