Merge branch 'develop' into feature/T27437-ITK-v5
- Conflicts:
- Modules/Core/src/Controllers/mitkRenderingManager.cpp
Paths
|
Merge branch 'develop' into feature/T27437-ITK-v5
Tags None Referenced Files None Subscribers None
Description Merge branch 'develop' into feature/T27437-ITK-v5
Details
Event Timeline
Merged Changes
Changes (52)
rMITK34f90004f1c8 Plugins/org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/src/internal/QmitkUSNavigationMarkerPlacement.cppLoading... Plugins/org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/src/internal/QmitkUltrasoundCalibration.cppLoading... Plugins/org.mitk.gui.qt.igt.app.ultrasoundtrackingnavigation/src/internal/USNavigation.cppLoading... Plugins/org.mitk.gui.qt.matchpoint.evaluator/src/internal/QmitkMatchPointRegistrationEvaluator.cppLoading... Plugins/org.mitk.gui.qt.matchpoint.manipulator/src/internal/QmitkMatchPointRegistrationManipulator.cppLoading... |