Diffusion MITK 27ba31a3d6f8

fixed merge conflicts... gui updates [cOK]
27ba31a3d6f8
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

fixed merge conflicts... gui updates [cOK]

Details

Provenance

Authored on Aug 12 2011, 12:17 PM

Parents

rMITK64a852a45a06: GUI updates [compOK] merge conflict1

Branches

Unknown

Tags

Unknown

Event Timeline

reicht committed rMITK27ba31a3d6f8: fixed merge conflicts... gui updates [cOK] (authored by reicht).Aug 12 2011, 12:17 PM

Changes (2)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberBundleDeveloperView.cpp

QmitkFiberBundleDeveloperViewControls.ui

rMITK27ba31a3d6f8

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

Loading...

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

Loading...