Diffusion MITK 7e2b22f7bb8a

Merge remote-tracking branch 'origin/T24609-v2018.04-alpha' into T24196…


Merge remote-tracking branch 'origin/T24609-v2018.04-alpha' into T24196-Integration-alpha

  1. Conflicts:
  2. Modules/QtWidgets/files.cmake
  3. Modules/QtWidgets/include/QmitkDataStorageTreeModel.h
  4. Modules/QtWidgets/src/QmitkDataStorageTreeModel.cpp

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>


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.