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
Merge branch 'bug-15849-VTK6Migration' into bug-15849…
Tags None Referenced Files None Subscribers None
Description Merge branch 'bug-15849-VTK6Migration' into bug-15849-VTK6Migration_IntegrationNov13 Conflicts:
Details
Event Timeline
Merged Changes
Changes (145) Very Large CommitThis commit is very large. Load each file individually.
rMITKb257fb5326aa Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkOrientationDistributionFunction.txx |