Merge branch 'master' into niftk
Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Merge branch 'master' into niftk 917d31e6fcfcUnpublished
Tags None Referenced Files None Subscribers None Unpublished Commit · Learn MoreNot On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description Merge branch 'master' into niftk Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (645) Very Large CommitThis commit is very large. Load each file individually.
rMITK917d31e6fcfc Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.cppModules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.hModules/DiffusionImaging/DiffusionCore/DicomImport/mitkSiemensMosaicDicomDiffusionImageHeaderReader.cppPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.doxPlugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDwiSoftwarePhantomViewUserManual.doxPlugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.htmlPlugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppFiberTractographyPerspective.cppPlugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cpp |