HomePhabricator
Diffusion MITK 67a6558e9b01

Merge branch 'master' into bug-14866…

Description

Merge branch 'master' into bug-14866-MakeFileReaderAndFileWriterMicroserviceBased-2014-03

Conflicts:
Core/Code/IO/mitkIOUtil.cpp
Core/Code/IO/mitkIOUtil.h
Core/Code/IO/mitkImageWriter.cpp
Core/Code/Testing/mitkExtractSliceFilterTest.cpp
Core/Code/Testing/mitkImageDimensionConverterTest.cpp
Core/Code/Testing/mitkImageToItkTest.cpp
Modules/SceneSerialization/CMakeLists.txt
Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp
Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

Merged Changes

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

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.