HomePhabricator
Diffusion MITK 4b7b3f9f5a70

Merge remote-tracking branch 'origin/bug-11700-OdfRenderWidget' into…

Description

Merge remote-tracking branch 'origin/bug-11700-OdfRenderWidget' into personal/hering/MITKDiffusion-2012-Bugfixes

Conflicts:
Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp