Merge branch 'bug-9258-IGTTrackingLab'
8c4a3a6b2fb2
Actions

Description

Merge branch 'bug-9258-IGTTrackingLab'

Details

Provenance

Authored on Oct 21 2011, 1:43 PM

Parents

rMITKfe5e3a3042b2: just removed some whitespaces and empty lines
rMITKda6de7f63abb: Merge branch 'bug-3139-NDIConfigurationWidget'

Branches

Unknown

Tags

Unknown

Event Timeline

mercea committed rMITK8c4a3a6b2fb2: Merge branch 'bug-9258-IGTTrackingLab' (authored by mercea).Oct 21 2011, 1:43 PM

Merged Changes

Changes (15)

Path

Size

Modules/

Bundles/

org.mitk.gui.qt.igttoolpairnavigation/

src/

internal/

QmitkToolPairNavigationView.cpp

org.mitk.gui.qt.igttrackinglab/

files.cmake

plugin.xml

resources/

QmitkIGTTrackingLabView.qrc

src/

internal/

IGTTrackingLabView.cpp

IGTTrackingLabView.h

IGTTrackingLabViewControls.ui

QmitkIGTTrackingLabView.cpp

	QmitkIGTTrackingLabView.h
	IGTTrackingLabView.h

	QmitkIGTTrackingLabViewControls.ui
	IGTTrackingLabViewControls.ui

mitkPluginActivator.cpp

rMITK8c4a3a6b2fb2

View Options

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/QmitkToolPairNavigationView.cpp

View Options

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

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/plugin.xml

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/QmitkIGTTrackingLabView.qrc

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/icon.png

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/icon.xpm

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/start_rec.png

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/stop_rec.png

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/IGTTrackingLabView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/IGTTrackingLabView.h

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/IGTTrackingLabViewControls.ui

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/QmitkIGTTrackingLabView.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/QmitkIGTTrackingLabView.h

View Options

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/QmitkIGTTrackingLabViewControls.ui

View Options

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

Merge branch 'bug-9258-IGTTrackingLab'8c4a3a6b2fb2Actions

Description

Details

Event Timeline

Merged Changes

Changes (15)

rMITK8c4a3a6b2fb2

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/QmitkToolPairNavigationView.cpp

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

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/plugin.xml

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/QmitkIGTTrackingLabView.qrc

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/icon.png

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/icon.xpm

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/start_rec.png

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/resources/stop_rec.png

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/IGTTrackingLabView.cpp

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/IGTTrackingLabView.h

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/IGTTrackingLabViewControls.ui

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/QmitkIGTTrackingLabView.cpp

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/QmitkIGTTrackingLabView.h

Modules/Bundles/org.mitk.gui.qt.igttrackinglab/src/internal/QmitkIGTTrackingLabViewControls.ui

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

Merge branch 'bug-9258-IGTTrackingLab'
8c4a3a6b2fb2
Actions