HomePhabricator
Diffusion MITK 0cfb6e889853

Merge branch 'master' into T19932-labSetupIntegrationAugust2017

Description

Merge branch 'master' 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 8 2017, 4:37 PM
kirchnthPushed on Aug 8 2017, 4:38 PM
Parents
rMITK87ead6717390: Merge branch 'T23194-themeForStatistics'
rMITKa403960a34e6: fixed undefined behaviour artifacts in US images --Thomas
Branches
Unknown
Tags
Unknown

Merged Changes

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