HomePhabricator
Diffusion MITK e5135118b9ff

Merge branch 'master' into gizmo-parts-highlighting-MASTER

Description

Merge branch 'master' into gizmo-parts-highlighting-MASTER

Signed-off-by: Daniel Maleike <code@maleike.de>

Conflicts:
Modules/Gizmo/src/mitkGizmoInteractor.cpp

Details

Provenance
maleikeAuthored on Aug 24 2017, 4:04 PM
gochPushed on Sep 18 2017, 5:51 PM
Parents
rMITK59ae0b8579ec: Make gizmo track the mouse and highlight parts of the gizmo when under mouse
rMITKfbd0f9ff217b: Merge branch 'T18922-FinalFixes'
Branches
Loading...
Tags
Loading...

Merged Changes

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

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.