Diffusion MITK 89464ebbdba0

Merge branch 'bug-17922-ToolStatusColor'
89464ebbdba0
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-17922-ToolStatusColor'

Conflicts:
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Details

Provenance

Authored on Jul 17 2014, 1:58 PM

Parents

rMITK7900947c8ab2: some runtime optimization / clean up of the DisplayImage method
rMITK0f50e2bdee11: Merge branch 'bug-17921-ExtendPreprocessing'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK89464ebbdba0: Merge branch 'bug-17922-ToolStatusColor' (authored by franza).Jul 17 2014, 1:58 PM

Merged Changes

Changes (6)

Path

Size

Modules/

IGT/

Common/

mitkTrackingTypes.h

IGTUI/

Qmitk/

QmitkToolTrackingStatusWidget.cpp

US/

USNavigation/

mitkUSCombinedModality.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

rMITK89464ebbdba0

Modules/IGT/Common/mitkTrackingTypes.h

Loading...

Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Loading...