Diffusion MITK 38d28d2c36f6

COMP: unrecognized merge errors
38d28d2c36f6
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

COMP: unrecognized merge errors

Details

Provenance

Klaus Fritzsche <fritzsck@mbi-nb20.(none)>

Authored on Sep 3 2011, 4:35 AM

Parents

rMITKd8b29e713cb3: Merge branch 'bug-9122-diffusion-imaging-executable-and-OS'

Branches

Unknown

Tags

Unknown

Event Timeline

Klaus Fritzsche <fritzsck@mbi-nb20.(none)> committed rMITK38d28d2c36f6: COMP: unrecognized merge errors (authored by Klaus Fritzsche <fritzsck@mbi-nb20.(none)>).Sep 3 2011, 4:35 AM

Changes (2)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.diffusionimagingapp/

src/

internal/

mitkPluginActivator.cpp

rMITK38d28d2c36f6

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake

Loading...

Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp

Loading...