HomePhabricator
Diffusion MITK 8c6003c3c092

Merge branch 'bug-5544-MultiShellReconstruction'

Description

Merge branch 'bug-5544-MultiShellReconstruction'

Conflicts:
Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp
Modules/DiffusionImaging/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.h
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.h

Details

Provenance
cordesAuthored on May 24 2012, 11:18 AM
Parents
rMITKb503d98d618c: update copyright
rMITKc311020bdc95: Merge branch 'bug-10773-IntegrationBranchKinect2'
Branches
Unknown
Tags
Unknown

Merged Changes