HomePhabricator
Diffusion MITK cae66d17e6ba

Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016.11.3…

Description

Merge remote-tracking branch 'remotes/origin/T22595-NavigationModules-2016.11.3-igt' into T22595-Masterintegration-2018-01-09

  1. Conflicts:
  2. Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidget.cpp
  3. Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.cpp
  4. Modules/IGTUI/Qmitk/QmitkNavigationToolCreationAdvancedWidget.h
  5. Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp
  6. Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.h
  7. Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp
  8. Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/USNavigationMarkerPlacement.h
  9. Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibration.cpp
  10. Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.