Merge remote-tracking branch 'origin/bug-8123-SimpleStyleTrackingDeviceConfigurationWidget2ndTry' into bug-8120-IGTConnectionWidget
Conflicts:
Modules/IGTUI/Qmitk/QmitkTrackingDeviceConfigurationWidgetControls.ui
Merge remote-tracking branch 'origin/bug-8123… Tags None Referenced Files None Subscribers None
Description
Details
Merged Changes |