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
Merge branch 'bug-14022-Accesslock-by-odf-widget' into bug-13788… Tags None Referenced Files None Subscribers None
Description
Details
Merged Changes |