Diffusion MITK 44582d7a0689

Merge remote-tracking branch 'origin/bug-8123…
44582d7a0689
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'origin/bug-8123-SimpleStyleTrackingDeviceConfigurationWidget2ndTry' into bug-8120-IGTConnectionWidget

Conflicts:
Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Details

Provenance

Authored on May 16 2011, 5:06 PM

Parents

rMITK0ebb25470d59: changed layout for simple style
rMITK23271a417730: Use TrackingDeviceConfigurationWidget in IGTConnectionWidget

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITK44582d7a0689: Merge remote-tracking branch 'origin/bug-8123… (authored by seitela).May 16 2011, 5:06 PM

Merged Changes

0ebb25470d59 changed layout for simple style
Author
franza
Browse Repository
No Builds
No Audits
f6d7f5352559 added simple and advanced frames
Author
franza
Browse Repository
No Builds
No Audits
3c1f465a7662 removed unnecessary UI elements
Author
franza
Browse Repository
No Builds
No Audits
2eba41111943 added new style enum and method to switch style
Author
franza
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

Modules/

IGTUI/

Qmitk/

QmitkIGTConnectionWidgetControls.ui

QmitkTrackingDeviceConfigurationWidget.cpp

QmitkTrackingDeviceConfigurationWidget.h

QmitkTrackingDeviceConfigurationWidgetControls.ui

rMITK44582d7a0689

Modules/IGTUI/Qmitk/QmitkIGTConnectionWidgetControls.ui

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.cpp

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidget.h

Loading...

Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Loading...