HomePhabricator
Diffusion MITK 8159dd720832

Merge remote-tracking branch 'origin/master' into bug-18605-modern-cmake-and…

Description

Merge remote-tracking branch 'origin/master' into bug-18605-modern-cmake-and-c++11

Conflicts:
CMake/mitkFunctionGetLibrarySearchPaths.cmake
CMakeExternals/redland.cmake
Modules/AlgorithmsExt/mitkSegmentationSink.h
Modules/Core/include/mitkBaseGeometry.h
Modules/Core/include/mitkGeometry3D.h
Modules/Core/include/mitkPlaneGeometry.h
Modules/Core/include/mitkProperties.h
Modules/Core/include/mitkSlicedGeometry3D.h
Modules/Core/tests/mitkSurfaceVtkMapper2DColorTest.cpp
Modules/Core/tests/mitkSurfaceVtkMapper2DOpacityTest.cpp
Modules/Multilabel/mitkLabelSetImageSerializer.h
Modules/QtWidgets/QmitkRenderWindow.h
Modules/Segmentation/CMakeLists.txt
Modules/Simulation/CMakeLists.txt
Modules/Simulation/mitkSimulationGLMapper2D.h
Modules/Simulation/mitkSimulationIO.h
Modules/Simulation/mitkSimulationReader.h
Modules/Simulation/mitkSimulationWriter.h
Modules/Simulation/mitkVtkSimulationPolyDataMapper2D.h
Modules/SurfaceInterpolation/CMakeLists.txt

Merged Changes

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