HomePhabricator
Diffusion MITK 2983d659c2b1

Merge branch 'bug-12506-plugin-for-ctk-cli-orig' into bug-12506-plugin-for…

Description

Merge branch 'bug-12506-plugin-for-ctk-cli-orig' into bug-12506-plugin-for-ctk-cli

Conflicts:
Modules/Qmitk/QmitkDataStorageComboBox.h

Removed trailing whitespaces and new lines.

Reviewed-by: Sascha Zelzer <s.zelzer@dkfz-heidelberg.de>

Merged Changes

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