HomePhabricator
Diffusion MITK 21260cc4ba9f

Merge remote-tracking branch 'remotes/origin/T19786…

Description

Merge remote-tracking branch 'remotes/origin/T19786-ImplementOverlayLayouterAsServiceRebaseDec' into T22595-NavigationModules-2016-11

  1. Conflicts:
  2. CMakeExternals/MatchPoint.cmake
  3. Modules/Core/src/Rendering/mitkVtkPropRenderer.cpp
  4. Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Details

Provenance
seitelaAuthored on Apr 21 2017, 3:26 PM
seitelaPushed on Apr 21 2017, 5:32 PM
Differential Revision
Restricted Differential Revision
Parents
rMITK09ddaad3ca03: Merge branch 'T22660-GeneralizeAutoDetectTools' into T22595-NavigationModules…
rMITKed5f12988bb2: update Annotation documentation and migration guide
Branches
Unknown
Tags
Unknown

Merged Changes

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