Diffusion MITK 22199e8f34d2

Merge branch 'bug-10048-fastFiberExtraction' into bug-10116…
22199e8f34d2
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-10048-fastFiberExtraction' into bug-10116-FiberBundleXintegration

Conflicts:
Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h

Details

Provenance

Authored on Nov 22 2011, 11:22 AM

Parents

rMITK60201ed37e74: interim updates
rMITKccc48a7946a2: Merge branch 'bug-8987-GibbsPolyData' into bug-10116-FiberBundleXintegration

Branches

Unknown

Tags

Unknown

Event Timeline

reicht committed rMITK22199e8f34d2: Merge branch 'bug-10048-fastFiberExtraction' into bug-10116… (authored by reicht).Nov 22 2011, 11:22 AM

Merged Changes

60201ed37e74 interim updates
Author
reicht
Browse Repository
No Builds
No Audits
bf932395de20 prototype fiber extraction
Author
reicht
Browse Repository
No Builds
No Audits
0d900cd5986f interim commit2, implement clipper
Author
reicht
Browse Repository
No Builds
No Audits
7aac7f6292f4 interim commit, implement clipper
Author
reicht
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberBundleDeveloperView.cpp

QmitkFiberBundleDeveloperView.h

QmitkFiberBundleDeveloperViewControls.ui

DiffusionImaging/

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

mitkFiberBundleX.h

rMITK22199e8f34d2

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp

Loading...

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h

Loading...

Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui

Loading...

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Loading...

Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h

Loading...