Merge branch 'bug-11075-micro-services-unregistration' into bug-11947-CreatePluginForManagmentOfUltrasoundDevices
Conflicts:
Modules/US/USModel/mitkUSDevice.h
Merge branch 'bug-11075-micro-services-unregistration' into bug-11947…
Tags None Referenced Files None Subscribers None
Description Merge branch 'bug-11075-micro-services-unregistration' into bug-11947-CreatePluginForManagmentOfUltrasoundDevices Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (709) Very Large CommitThis commit is very large. Load each file individually.
rMITKf75c9567eb50 Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSimulatedAnnealingCostFunctionBase.hModules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSimulatedAnnealingCostFunctionModularity.cppModules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSimulatedAnnealingCostFunctionModularity.hModules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSimulatedAnnealingPermutationBase.hModules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSimulatedAnnealingPermutationModularity.cppModules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsSimulatedAnnealingPermutationModularity.hModules/RigidRegistrationUI/RigidRegistrationMetrics/QmitkCorrelationCoefficientHistogramMetricView.cppModules/RigidRegistrationUI/RigidRegistrationMetrics/QmitkNormalizedMutualInformationHistogramMetricView.cppPlugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.cpp |