HomePhabricator
Diffusion MITK 375978146e1e

Merge branch 'bug-14022-Accesslock-by-odf-widget' into bug-13788…

Description

Merge branch 'bug-14022-Accesslock-by-odf-widget' into bug-13788-MitkDiffusion_2012.12

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