Merge branch 'T19932-hardwareControlUnited' into T19932-labSetup
- Conflicts:
- Modules/Overlays/mitkScaleLegendOverlay.cpp
Merge branch 'T19932-hardwareControlUnited' into T19932-labSetup
Tags None Referenced Files None Subscribers None
Description Merge branch 'T19932-hardwareControlUnited' into T19932-labSetup
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (142)
rMITK2e171c1b5cfc Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexConjugateToRealImageFilter.hxxLoading... Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DRealToComplexConjugateImageFilter.hxxLoading... Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/internal/QmitkPAUSViewerViewControls.uiLoading... Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/internal/org_mitk_gui_qt_photoacoustics_pausviewer_Activator.cppLoading... |