Diffusion MITK 00e8305cd0c1

Merge branch 'test' into bug-18057-SignalSampling
00e8305cd0c1
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'test' into bug-18057-SignalSampling

Conflicts:
Modules/DiffusionImaging/FiberTracking/IODataStructures/mitkFiberfoxParameters.h

Details

Provenance

Authored on Sep 3 2014, 2:27 PM

Parents

rMITK8830138b27e1: WIP on master: 01ff9b4 Merge branch 'bug-18054-FiberfoxMiniApp'
rMITK11c78981bd23: Merge branch 'bug-18055-FiberfoxDashboard'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITK00e8305cd0c1: Merge branch 'test' into bug-18057-SignalSampling (authored by neher).Sep 3 2014, 2:27 PM

Merged Changes

8830138b27e1 WIP on master: 01ff9b4 Merge branch 'bug-18054-FiberfoxMiniApp'
Author
neher
Browse Repository
No Builds
No Audits
c37ebbf08d2b index on master: 01ff9b4 Merge branch 'bug-18054-FiberfoxMiniApp'
Author
neher
Browse Repository
No Builds
No Audits

Changes (3)

Path

Size

Modules/

DiffusionImaging/

FiberTracking/

SignalModels/

mitkRawShModel.cpp

mitkRawShModel.h

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberfoxView.cpp

rMITK00e8305cd0c1

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkRawShModel.cpp

Loading...

Modules/DiffusionImaging/FiberTracking/SignalModels/mitkRawShModel.h

Loading...

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.cpp

Loading...