Merge branch 'T24505-InvalidServiceRegistrationBaseObject' into T24059…
80cc01839af7
Actions

Description

Merge branch 'T24505-InvalidServiceRegistrationBaseObject' into T24059-IGTRelease-2018.03

Details

Provenance

Parents

Branches

Unknown

Tags

Unknown

Merged Changes

Changes (7)

Path

Size

Modules/

US/

USModel/

USUI/

Qmitk/

Plugins/

org.mitk.gui.qt.ultrasound/

src/

internal/

rMITK80cc01839af7

Modules/US/USModel/mitkUSDevice.cpp

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.cpp

Modules/USUI/Qmitk/QmitkUSAbstractCustomWidget.h

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSControlsCustomVideoDeviceWidget.cpp

Modules/USUI/mitkUSUIActivator.cpp

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

Merge branch 'T24505-InvalidServiceRegistrationBaseObject' into T24059…80cc01839af7Actions