Merge branch 'bug-8554-diffusion-imaging-app' into bug-8554-dti-atlas-app
Conflicts:
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc
Merge branch 'bug-8554-diffusion-imaging-app' into bug-8554-dti-atlas-app
Tags None Referenced Files None Subscribers None
Description Merge branch 'bug-8554-diffusion-imaging-app' into bug-8554-dti-atlas-app Conflicts:
Details
Event Timeline
Merged Changes
Changes (120) Very Large CommitThis commit is very large. Load each file individually.
rMITK3ddae7750ed2 Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cppModules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.hModules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.uiModules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.htmlModules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cppModules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cppModules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cppModules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsViewControls.uiModules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcpModules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplication.h~bug-8511-DTI-atlas-app |