Merge branch 'master' of mitk.org:MITK
b97587ed8a42
Actions

Description

Merge branch 'master' of mitk.org:MITK

Details

Provenance

Authored on Mar 18 2015, 1:47 PM

Parents

rMITKb2666e9ee821: Merge branch 'bug-18603-MigrateToVTK6-2'
rMITK6fea510e62f8: Merge branch 'bug-18845-fixes-for-cmake32'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITKb97587ed8a42: Merge branch 'master' of mitk.org:MITK (authored by • fetzer).Mar 18 2015, 1:47 PM

Merged Changes

b2666e9ee821 Merge branch 'bug-18603-MigrateToVTK6-2'
Author
• kolbch
Browse Repository
No Builds
No Audits
2bf2a8d97980 Merge branch 'bug-18845-fixes-for-cmake32'
Author
• fetzer
Browse Repository
No Builds
No Audits
1396f0254a0a new testdata for fiberextractiontest
Author
• kolbch
Browse Repository
No Builds
No Audits
2d2b6fd4d549 vtk 6.2 changes in diffusionImaging
Author
• kolbch
Browse Repository
No Builds
No Audits
b8e92633926e set correct MD5 hash for vtk 6.2.0
Author
• kolbch
Browse Repository
No Builds
No Audits
8da18d072c43 set vtk to version 6.2.0 and fix errors
Author
• kolbch
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

VTK-6.1.0+74f4888.patch

O1: MITK Reviewer Group I

	VTK-6.2.0.patch
	VTK-6.1.0+74f4888.patch

O1: MITK Reviewer Group I

VTK.cmake

O1: MITK Reviewer Group I

Modules/

Core/

include/

mitkSurfaceVtkMapper3D.h

O1: MITK Reviewer Group I

DiffusionImaging/

DiffusionCore/

Rendering/

vtkOdfSource.cxx

DiffusionIO/

mitkFiberBundleMapper3D.cpp

mitkFiberBundleMapper3D.h

IOExt/

CMakeLists.txt

MapperExt/

src/

vtkUnstructuredGridMapper.cpp

rMITKb97587ed8a42

View Options

CMakeExternals/MITKData.cmake

View Options

CMakeExternals/VTK-6.1.0+74f4888.patch

View Options

CMakeExternals/VTK-6.2.0.patch

View Options

CMakeExternals/VTK.cmake

View Options

Modules/Core/include/mitkSurfaceVtkMapper3D.h

View Options

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkOdfSource.cxx

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

View Options

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.h

View Options

Modules/IOExt/CMakeLists.txt

View Options

Modules/MapperExt/src/vtkUnstructuredGridMapper.cpp

Merge branch 'master' of mitk.org:MITKb97587ed8a42Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITKb97587ed8a42

CMakeExternals/MITKData.cmake

CMakeExternals/VTK-6.1.0+74f4888.patch

CMakeExternals/VTK-6.2.0.patch

CMakeExternals/VTK.cmake

Modules/Core/include/mitkSurfaceVtkMapper3D.h

Modules/DiffusionImaging/DiffusionCore/Rendering/vtkOdfSource.cxx

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.cpp

Modules/DiffusionImaging/DiffusionIO/mitkFiberBundleMapper3D.h

Modules/IOExt/CMakeLists.txt

Modules/MapperExt/src/vtkUnstructuredGridMapper.cpp

Merge branch 'master' of mitk.org:MITK
b97587ed8a42
Actions