HomePhabricator
Diffusion MITK 961c68ca5ad4

Merge branch 'T19932-labSetup' into T19932-labSetupIntegrationAugust2017

Description

Merge branch 'T19932-labSetup' into T19932-labSetupIntegrationAugust2017

  1. Conflicts:
  2. Plugins/PluginList.cmake
  3. Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Details

Provenance
kirchnthAuthored on Aug 2 2017, 8:34 PM
kirchnthPushed on Aug 2 2017, 8:33 PM
Parents
rMITK8a029d820d0a: this now actually scans multiple angles -Thomas
rMITKd993ade5821d: Merge branch 'T23108-MlTrackingUpdates'
Branches
Unknown
Tags
Unknown

Merged Changes

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