HomePhabricator
Diffusion MITK bc0095f53ac4

Merge remote-tracking branch 'origin/bug-16699-split-up-MitkExt-module' into…

Description

Merge remote-tracking branch 'origin/bug-16699-split-up-MitkExt-module' into bug-14866-MakeFileReaderAndFileWriterMicroserviceBased-2013-12

Conflicts:
CMake/mitkSetupVariables.cmake
Core/Code/Common/mitkCoreObjectFactory.cpp
Core/Code/Common/mitkCoreObjectFactory.h
Core/Code/Controllers/mitkCoreActivator.cpp
Core/Code/Testing/mitkDICOMLocaleTest.cpp
Modules/CMakeLists.txt
Modules/IpPicSupport/CMakeLists.txt
Modules/QmitkExt/files.cmake

Details

Merged Changes

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