HomePhabricator
Diffusion MITK f030ea8d1706

Merge branch 'master' into bug-5544-MultiShellReconstruction

Description

Merge branch 'master' into bug-5544-MultiShellReconstruction

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

Details

Provenance
cordesAuthored on Apr 24 2012, 5:28 PM
Parents
rMITKf762027df61f: implemented new lambda calculation
rMITK2b38a2e446b5: Merge branch 'bug-11729-PVAnalysis-fix'
Branches
Unknown
Tags
Unknown

Merged Changes

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