HomePhabricator
Diffusion MITK ec289f58d0f5

Merge branch 'T22595-MasterIntegration-2017-10-12' into T22595…

Description

Merge branch 'T22595-MasterIntegration-2017-10-12' into T22595-Masterintegration-2018-01-09

  1. Conflicts:
  2. Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.h
  3. Modules/IGTUI/Qmitk/QmitkNDIAuroraWidget.h
  4. Modules/IGTUI/Qmitk/QmitkNDIPolarisWidget.h
  5. Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.h
  6. Modules/IGTUI/Qmitk/QmitkOpenIGTLinkWidget.h
  7. Modules/IGTUI/Qmitk/QmitkVirtualTrackerWidget.h

Details

Provenance
franzaAuthored on Jan 9 2018, 8:00 PM
franzaPushed on Jan 9 2018, 10:56 PM
Parents
rMITK41b44de83ee6: Merge branch 'T24021-fix-test'
rMITKce41ca490a76: Merge branch 'T22595-NavigationModules-2016.11.3-igt' into T22595…
Branches
Unknown
Tags
Unknown

Merged Changes

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