Merge branch 'master' into gizmo-parts-highlighting-MASTER
Signed-off-by: Daniel Maleike <code@maleike.de>
Conflicts:
Modules/Gizmo/src/mitkGizmoInteractor.cpp
Merge branch 'master' into gizmo-parts-highlighting-MASTER
Signed-off-by: Daniel Maleike <code@maleike.de>
Conflicts:
Modules/Gizmo/src/mitkGizmoInteractor.cpp
maleike | Authored on Aug 24 2017, 4:04 PM |
• goch | Pushed on Sep 18 2017, 5:51 PM |