HomePhabricator
Diffusion MITK b257fb5326aa

Merge branch 'bug-15849-VTK6Migration' into bug-15849…

Description

Merge branch 'bug-15849-VTK6Migration' into bug-15849-VTK6Migration_IntegrationNov13

Conflicts:
Core/Code/DataManagement/mitkVector.cpp
Modules/IGT/IGTFilters/mitkTrackingVolumeGenerator.cpp
Modules/Qmitk/CMakeLists.txt

Details

Provenance
kolbchAuthored on Nov 20 2013, 3:48 PM
Parents
rMITK50ee5cc3f3e9: fix typo
rMITK522d8162078d: Merge branch 'bug-16441-FixTensorToDWIFilter'
Branches
Unknown
Tags
Unknown

Merged Changes