Merge branch 'bug-14892-IntegrationWithITK4' into bug-14892-Release201309-Integration
Conflicts:
Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp
Merge branch 'bug-14892-IntegrationWithITK4' into bug-14892-Release201309…
Tags None Referenced Files None Subscribers None
Description Merge branch 'bug-14892-IntegrationWithITK4' into bug-14892-Release201309-Integration Conflicts:
Details
Event Timeline
Merged Changes
Changes (192)
rMITK98d537c0e152 Modules/DiffusionImaging/DiffusionCore/Algorithms/Registration/mitkDWIHeadMotionCorrectionFilter.cppLoading... Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkConnectomicsDataView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cppLoading... Plugins/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.cppLoading... |