HomePhabricator
Diffusion MITK 2cb8edc5bc84

Merge branch 'T22228-PAplugin' into T22228-PApluginIntegrationAugust2017

Description

Merge branch 'T22228-PAplugin' into T22228-PApluginIntegrationAugust2017

  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:42 PM
kirchnthPushed on Aug 2 2017, 8:41 PM
Parents
rMITK3b4dae6d577a: Merge branch 'T23145-DiffusionTractographyWarning'
rMITK7908053a44b2: new svg icon for the pa plugin
Branches
Unknown
Tags
Unknown

Merged Changes

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