User neher has pushed new remote branch:

bug-18825-FiberfoxCompartments

[c30db3]: Merge branch 'bug-18825-FiberfoxCompartments'

Merged commits:

2015-03-13 11:06:41 Peter Neher [e56805]
all compartments are able to use volume fraction maps now

2015-03-12 07:39:30 Peter Neher [e1a8db]
Merge branch 'personal/neher/ismrm_phantom5' into bug-18825-FiberfoxCompartments

2015-03-10 17:01:10 Peter Neher [d42c86]
adding support for fiber compartment volume map

2015-03-09 16:23:23 Peter Neher [94b92b]
integrated ismrm changes

2015-03-09 12:52:59 Peter Neher [38acbc]
Merge branch 'personal/neher/ismrm_phantom4' into personal/neher/ismrm_phantom5

2015-02-11 18:05:10 Peter Neher [62ceaa]
flippiing gradients when flipping image

2015-02-07 12:35:58 Peter Neher [dbaa72]
mergetry

2015-02-07 12:22:38 Peter Neher [2e32d2]
Merge branch 'personal/neher/ismrm_phantom3' into personal/neher/ismrm_phantom4

Conflicts:
Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXMapper3D.cpp
Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleXReader.cpp
Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp
Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.h
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp
Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp

2015-02-04 13:30:20 Peter Neher [477c33]
wip

2015-01-28 17:02:54 Peter Neher [e45865]
Merge branch 'personal/neher/ismrm_phantom2' into personal/neher/ismrm_phantom3

2015-01-28 16:25:37 Peter Neher [9064fe]
wip

2015-01-24 12:33:05 Peter Neher [9b0e13]
volume fractions

2015-01-23 18:56:37 Peter Neher [c189a2]
modified streamline tracking gui

2015-01-23 17:51:22 Peter Neher [c8b172]
wip

2015-01-21 17:59:37 Peter Neher [117f49]
Merge branch 'personal/neher/ismrm_phantom' into personal/neher/ismrm_phantom2

2015-01-21 13:31:52 Peter Neher [8ba4ec]
spikes not in b0 volume

2015-01-17 18:01:08 Peter Neher [1a1b9e]
adapted for headmotion

2015-01-17 12:18:17 Peter Neher [cabe02]
added additional density correctiony by tdi