HomePhabricator
Diffusion MITK 2556a99fa950

Merge branch 'bug-15852-u6…

Description

Merge branch 'bug-15852-u6-platformproject_enable_easy_conversion_of_datatypes' into bug-15852-u7-platformproject_enable_easy_conversion_of_datatypes

Conflicts:
Core/Code/DataManagement/mitkAbstractTransformGeometry.h
Core/Code/DataManagement/mitkGeometry2D.cpp
Core/Code/DataManagement/mitkGeometry3D.cpp
Core/Code/DataManagement/mitkGeometry3D.h
Core/Code/Testing/mitkClippedSurfaceBoundsCalculatorTest.cpp
Core/Code/Testing/mitkGeometry3DTest.cpp
Core/Documentation/Doxygen/Concepts/GeometryOverview.dox
Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkTbssImporter.cpp
Modules/Ext/Testing/mitkPlaneFitTest.cpp
Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp
Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilterNew.cpp
Modules/IpPicSupport/Testing/mitkPicFileReaderTest.cpp
Modules/QtWidgetsExt/QmitkSliceWidget.cpp

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.