Merge remote-tracking branch 'remotes/origin/bug-8165-imageMapper2D-cleanup' into bug-8165-integration-imageMapper2D
Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Core/Code/files.cmake
Merge remote-tracking branch 'remotes/origin/bug-8165-imageMapper2D-cleanup'…
Tags None Referenced Files None Subscribers None
Description Merge remote-tracking branch 'remotes/origin/bug-8165-imageMapper2D-cleanup' into bug-8165-integration-imageMapper2D Conflicts:
Details
Event Timeline
Merged Changes
|