HomePhabricator
Diffusion MITK 8ed26c470544

Merge branch 'bug-14866-MakeFileReaderAndFileWriterMicroserviceBased-2013-12'…

Description

Merge branch 'bug-14866-MakeFileReaderAndFileWriterMicroserviceBased-2013-12' into bug-14866-MakeFileReaderAndFileWriterMicroserviceBased-2014-03

Conflicts:
CMake/mitkSetupVariables.cmake
Core/Code/Controllers/mitkCoreActivator.cpp
Core/Code/Rendering/mitkRenderingTestHelper.h
Core/Code/Testing/mitkDICOMLocaleTest.cpp
Core/Code/Testing/mitkImageTest.cpp
Core/Code/files.cmake
Modules/CMakeLists.txt
Modules/IpPicSupport/CMakeLists.txt
Modules/IpPicSupportIO/CMakeLists.txt
Modules/LegacyIO/mitkFileSeriesReader.h
Modules/LegacyIO/mitkImageWriter.cpp
Modules/LegacyIO/mitkItkImageFileReader.h
Modules/LegacyIO/mitkRawImageFileReader.h
Modules/LegacyIO/mitkSTLFileReader.h
Modules/LegacyIO/mitkSurfaceVtkWriter.h
Modules/LegacyIO/mitkVtiFileReader.h
Modules/LegacyIO/mitkVtkImageReader.h
Modules/LegacyIO/mitkVtkSurfaceReader.h
Modules/MitkAlgorithmsExt/Testing/mitkBoundingObjectCutterTest.cpp
Modules/MitkDataTypesExt/Testing/mitkCompressedImageContainerTest.cpp
Modules/MitkExt/CMakeLists.txt
Modules/MitkIOExt/CMakeLists.txt
Modules/PlanarFigure/CMakeLists.txt
Modules/Qmitk/CMakeLists.txt
Modules/Qmitk/QmitkIOUtil.cpp
Modules/Qmitk/QmitkIOUtil.h
Modules/Qmitk/QmitkServiceListWidget.h
Modules/QmitkExt/files.cmake
Modules/SceneSerialization/CMakeLists.txt

Merged Changes

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