HomePhabricator
Diffusion MITK 383332ac1a43

Merge branch 'bug-14892-ITK4_GeometryRedesign' into bug-14892…

Description

Merge branch 'bug-14892-ITK4_GeometryRedesign' into bug-14892-IntegrationWithITK4

Conflicts:
Core/Code/DataManagement/mitkGeometry3D.cpp
Core/Code/DataManagement/mitkImage.cpp
Core/Code/IO/mitkImageWriter.cpp
Core/Code/Testing/mitkImageTest.cpp
Core/Code/files.cmake
Modules/MitkExt/Algorithms/mitkAngleCorrectByPointFilter.cpp
Modules/MitkExt/Algorithms/mitkAutoCropImageFilter.cpp
Modules/MitkExt/Algorithms/mitkSurfaceToImageFilter.cpp
Modules/MitkExt/Algorithms/mitkTimeHelper.h
Modules/MitkExt/Interactions/mitkTool.cpp
Modules/QmitkExt/QmitkFunctionalityComponents/QmitkThresholdComponent.cpp
Modules/QmitkExt/QmitkSlicesInterpolator.cpp
Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp
Modules/Segmentation/Rendering/mitkContourModelMapper3D.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.cpp

Details

Provenance
goetzmAuthored on Sep 9 2013, 10:02 PM
Parents
rMITK12a2045bb30a: Changes from CodeReview
rMITK668ab376f369: Merge branch 'bug-15770-SignalProcessing_fix'
Branches
Unknown
Tags
Unknown

Merged Changes