HomePhabricator
Diffusion MITK 1c2c5500873e

Merge branch 'bug-8386-merge-snapshot'
1c2c5500873e
Actions

Description

Merge branch 'bug-8386-merge-snapshot'

Conflicts:
Modules/MitkExt/Testing/files.cmake

Details

Provenance
maleikeAuthored on Jun 6 2011, 3:26 PM
Parents
rMITKd17937661997: MitkExt now depends on ImageStatistics, so the modules must build first
rMITKb1dc971e29e8: Merge branch 'bug-8374-manual-restart-continuous-dartclients'
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (63)

PathSizePackages
CMakeExternals/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Modules/
ImageExtraction/
Testing/
PlanarFigure/
Testing/
ImageExtraction/
MitkExt/
Testing/
Algorithms/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
ImageStatistics/
Testing/
DeformableRegistration/
Testing/
O1: MITK Reviewer Group I
ImageStatistics/
MitkExt/
Testing/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Algorithms/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
MitkExt/
Algorithms/
Testing/
PlanarFigure/
DataManagement/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Rendering/
O1: MITK Reviewer Group I

rMITK1c2c5500873e

View Options

CMakeExternals/DCMTK.cmake

Loading...
View Options

CMakeExternals/EmptyFileForPatching.dummy

Loading...
View Options

CMakeExternals/PatchDCMTK.cmake

Loading...
View Options

Modules/CMakeLists.txt

Loading...
View Options

Modules/ImageExtraction/CMakeLists.txt

Loading...
View Options

Modules/ImageExtraction/Testing/CMakeLists.txt

Loading...
View Options

Modules/ImageExtraction/Testing/Data/img.nrrd

Loading...
View Options

Modules/ImageExtraction/Testing/Data/lungs.vtk

Loading...
View Options

Modules/ImageExtraction/Testing/Data/testNrrd.ascii

Loading...
View Options

Modules/ImageExtraction/Testing/Data/testNrrd.nhdr

Loading...
View Options

Modules/ImageExtraction/Testing/Data/testimage.dcm

Loading...
View Options

Modules/ImageExtraction/Testing/Data/vtkUnstructuredGrid.vtk

Loading...
View Options

Modules/ImageExtraction/Testing/files.cmake

Loading...
View Options

Modules/ImageExtraction/Testing/mitkCompareImageSliceTestHelper.h

Loading...
View Options

Modules/ImageExtraction/Testing/mitkExtractImageFilterTest.cpp

Loading...
View Options

Modules/ImageExtraction/files.cmake

Loading...
View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

Loading...
View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.h

Loading...
View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilterNew.cpp

Loading...
View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilterNew.h

Loading...
View Options

Modules/ImageExtraction/mitkExtractImageFilter.cpp

Loading...
View Options

Modules/ImageExtraction/mitkExtractImageFilter.h

Loading...
View Options

Modules/ImageStatistics/CMakeLists.txt

Loading...
View Options

Modules/ImageStatistics/Testing/CMakeLists.txt

Loading...
View Options

Modules/ImageStatistics/Testing/Data/img.nrrd

Loading...
View Options

Modules/ImageStatistics/Testing/Data/lungs.vtk

Loading...
View Options

Modules/ImageStatistics/Testing/Data/testNrrd.ascii

Loading...
View Options

Modules/ImageStatistics/Testing/Data/testNrrd.nhdr

Loading...
View Options

Modules/ImageStatistics/Testing/Data/testimage.dcm

Loading...
View Options

Modules/ImageStatistics/Testing/Data/vtkUnstructuredGrid.vtk

Loading...
View Options

Modules/ImageStatistics/Testing/files.cmake

Loading...
View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

Loading...
View Options

Modules/ImageStatistics/files.cmake

Loading...
View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp

Loading...
View Options

Modules/ImageStatistics/mitkImageStatisticsCalculator.h

Loading...
View Options

Modules/ImageStatistics/mitkvtkImageStencilRaster.h

Loading...
View Options

Modules/ImageStatistics/mitkvtkLassoStencilSource.h

Loading...
View Options

Modules/ImageStatistics/vtkImageStencilRaster.cxx

Loading...
View Options

Modules/ImageStatistics/vtkLassoStencilSource.cxx

Loading...
View Options

Modules/MitkExt/Algorithms/mitkExtractDirectedPlaneImageFilter.cpp

Loading...
View Options

Modules/MitkExt/Algorithms/mitkExtractDirectedPlaneImageFilter.h

Loading...
View Options

Modules/MitkExt/Algorithms/mitkExtractDirectedPlaneImageFilterNew.cpp

Loading...
View Options

Modules/MitkExt/Algorithms/mitkExtractDirectedPlaneImageFilterNew.h

Loading...
View Options

Modules/MitkExt/Algorithms/mitkExtractImageFilter.cpp

Loading...
View Options

Modules/MitkExt/Algorithms/mitkExtractImageFilter.h

Loading...
View Options

Modules/MitkExt/Algorithms/mitkImageStatisticsCalculator.cpp

Loading...
View Options

Modules/MitkExt/Algorithms/mitkImageStatisticsCalculator.h

Loading...
View Options

Modules/MitkExt/Algorithms/vtkImageStencilRaster.cxx

Loading...
View Options

Modules/MitkExt/Algorithms/vtkLassoStencilSource.cxx

Loading...
View Options

Modules/MitkExt/CMakeLists.txt

Loading...
View Options

Modules/MitkExt/Testing/files.cmake

Loading...
View Options

Modules/MitkExt/Testing/mitkExtractImageFilterTest.cpp

Loading...
View Options

Modules/MitkExt/Testing/mitkOverwriteSliceImageFilterTest.cpp

Loading...
View Options

Modules/MitkExt/files.cmake

Loading...
View Options

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp

Loading...
View Options

Modules/PlanarFigure/DataManagement/mitkPlanarFigure.h

Loading...
View Options

Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp

Loading...
MITK · MIC · IMSY · DKFZ