HomePhabricator
Diffusion MITK 64e97dfd8ddc

Merge remote-tracking branch 'origin/bug-8123…

Description

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

Conflicts:
Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui

Details

Provenance
seitelaAuthored on May 17 2011, 8:07 AM
Parents
rMITKa07a856e5260: set default to advanced style again
rMITKc0334d0b7403: Some GUI changes
Branches
Unknown
Tags
Unknown