HomePhabricator
Diffusion MITK ca577d35be60

Merge branch 'master' into bug-18261-MakePluginsCompatibleToQt5

Description

Merge branch 'master' into bug-18261-MakePluginsCompatibleToQt5

Conflicts:
Plugins/org.mitk.gui.qt.dicom/src/internal/mitkPluginActivator.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp

Details

Provenance
kislinskAuthored on Nov 20 2014, 10:57 AM
Parents
rMITKa9ee608d87bb: Fix end of application crash
rMITK4e7903138cbe: Merge branch 'bug-18253-macos-miniz-resource-lock'
Branches
Unknown
Tags
Unknown

Merged Changes

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