Diffusion MITK 8b4f5cb5475a

Merge branch 'bug-12952-RedesignIGTTrackingLab' into bug-12952…
8b4f5cb5475a
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-12952-RedesignIGTTrackingLab' into bug-12952-TutorialIGTTrackingLabBasedOnNewMaster

Conflicts:
Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp
Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.h
Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp
Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h

Details

Provenance

Authored on Nov 14 2012, 7:20 PM

Parents

rMITK2e84a66277b7: removed trailing whitespaces
rMITK235a3c8e5c33: Merge branch 'bug-13531-ClonePointSet'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK8b4f5cb5475a: Merge branch 'bug-12952-RedesignIGTTrackingLab' into bug-12952… (authored by franza).Nov 14 2012, 7:20 PM

Merged Changes

Changes (5)

Path

Size

Modules/

IGTUI/

Qmitk/

QmitkNavigationDataSourceSelectionWidget.cpp

QmitkNavigationDataSourceSelectionWidget.h

Plugins/

org.mitk.gui.qt.igtexamples/

src/

internal/

QmitkIGTTrackingLabView.cpp

QmitkIGTTrackingLabView.h

QmitkIGTTrackingLabViewControls.ui

rMITK8b4f5cb5475a

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkNavigationDataSourceSelectionWidget.h

Loading...

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp

Loading...

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h

Loading...

Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabViewControls.ui

Loading...