HomePhabricator
Diffusion MITK 74068804a87d

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:
Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake
CMake/MITKDashboardScript.TEMPLATE.cmake
CMake/mitkFunctionGetLibrarySearchPaths.cmake
CMakeLists.txt
Core/Code/Algorithms/mitkSurfaceToSurfaceFilter.h
Core/Code/DataManagement/mitkSurface.h
Core/Code/IO/mitkAbstractFileIO.h
Core/Code/IO/mitkAbstractFileReader.cpp
Core/Code/IO/mitkIOUtil.h
Core/Code/IO/mitkItkImageIO.cpp
Core/Code/IO/mitkItkImageIO.h
Core/Code/IO/mitkMimeType.h
Core/Code/Internal/mitkCoreActivator.cpp
Core/Code/Internal/mitkItkImageIO.cpp
Core/Code/Internal/mitkItkImageIO.h
Core/Code/files.cmake
MITKConfig.cmake.in
Modules/Core/src/IO/mitkItkImageIO.cpp
Modules/Core/src/IO/mitkItkImageIO.h
Modules/DicomRT/mitkRTDoseReader.cpp
Modules/DiffusionImaging/DiffusionIO/mitkDiffusionIOMimeTypes.h
Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundle.h
Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundle/mitkFiberBundleThreadMonitor.h
Modules/DiffusionImaging/FiberTracking/Rendering/mitkFiberBundleThreadMonitorMapper3D.h
Modules/PlanarFigure/CMakeLists.txt
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.h
SuperBuild.cmake

Merged Changes

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