Merge branch 'bug-14892-Release201309-Integration' into bug-14892-MergeBranch
52ede3c5f3bc
Actions

Description

Merge branch 'bug-14892-Release201309-Integration' into bug-14892-MergeBranch

Conflicts:
Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp
Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkCreateSimulationAction.cpp
Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp

Merge branch 'bug-14892-Release201309-Integration' into bug-14892-MergeBranch52ede3c5f3bcActions

Description

Details

Event Timeline

Merged Changes

Changes (191)

rMITK52ede3c5f3bc

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

Core/Code/Algorithms/mitkExtractSliceFilter.h

Core/Code/Algorithms/mitkGeometry2DDataToSurfaceFilter.cpp

Core/Code/Algorithms/mitkImageChannelSelector.cpp

Core/Code/Algorithms/mitkRGBToRGBACastImageFilter.cpp

Core/Code/Algorithms/mitkSurfaceToImageFilter.cpp

Core/Code/Algorithms/mitkTimeHelper.h

Core/Code/Common/mitkCoreObjectFactory.cpp

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/Controllers/mitkRenderingManager.h

Core/Code/Controllers/mitkSliceNavigationController.cpp

Core/Code/Controllers/mitkSliceNavigationController.h

Core/Code/Controllers/mitkSlicesCoordinator.h

Core/Code/Controllers/mitkSlicesRotator.cpp

Core/Code/Controllers/mitkSlicesRotator.h

Core/Code/Controllers/mitkSlicesSwiveller.cpp

Core/Code/Controllers/mitkSlicesSwiveller.h

Core/Code/DataManagement/mitkBaseData.cpp

Core/Code/DataManagement/mitkBaseData.h

Core/Code/DataManagement/mitkBaseDataTestImplementation.h

Core/Code/DataManagement/mitkDataStorage.cpp

Core/Code/DataManagement/mitkDataStorage.h

Core/Code/DataManagement/mitkDisplayGeometry.cpp

Core/Code/DataManagement/mitkGeometry2DData.cpp

Core/Code/DataManagement/mitkGeometry3D.cpp

Core/Code/DataManagement/mitkGeometry3D.h

Core/Code/DataManagement/mitkImage.cpp

Core/Code/DataManagement/mitkImage.h

Core/Code/DataManagement/mitkImageToItk.txx

Core/Code/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp

Core/Code/DataManagement/mitkPointSet.cpp

Core/Code/DataManagement/mitkProportionalTimeGeometry.cpp

Core/Code/DataManagement/mitkProportionalTimeGeometry.h

Core/Code/DataManagement/mitkSlicedData.cpp

Core/Code/DataManagement/mitkSlicedData.h

Core/Code/DataManagement/mitkSlicedGeometry3D.cpp

Core/Code/DataManagement/mitkSurface.cpp

Core/Code/DataManagement/mitkThinPlateSplineCurvedGeometry.cpp

Core/Code/DataManagement/mitkTimeGeometry.cpp

Core/Code/DataManagement/mitkTimeGeometry.h

Core/Code/DataManagement/mitkTimeSlicedGeometry.cpp

Core/Code/DataManagement/mitkTimeSlicedGeometry.h

Core/Code/IO/mitkImageWriter.cpp

Core/Code/IO/mitkItkImageFileReader.cpp

Core/Code/IO/mitkSurfaceVtkWriter.txx

Core/Code/Interactions/mitkAffineInteractor.cpp

Core/Code/Interactions/mitkInteractor.cpp

Core/Code/Interactions/mitkMoveBaseDataInteractor.cpp

Core/Code/Interactions/mitkPointSetInteractor.cpp

Core/Code/Rendering/mitkBaseRenderer.cpp

Core/Code/Rendering/mitkBaseRenderer.h

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Rendering/mitkMapper.cpp

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Core/Code/Rendering/mitkRenderingTestHelper.cpp

Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp

Core/Code/Rendering/mitkVolumeDataVtkMapper3D.cpp

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkAbstractTransformGeometryTest.cpp

Core/Code/Testing/mitkAbstractTransformPlaneGeometryTest.cpp

Core/Code/Testing/mitkBaseDataTest.cpp

Core/Code/Testing/mitkDataStorageTest.cpp

Core/Code/Testing/mitkImageTest.cpp

Core/Code/Testing/mitkImageVtkMapper2DOpacityTest.cpp

Core/Code/Testing/mitkSTLFileReaderTest.cpp

Core/Code/Testing/mitkSliceNavigationControllerTest.cpp

Core/Code/Testing/mitkSlicedGeometry3DTest.cpp

Core/Code/Testing/mitkSurfaceTest.cpp

Core/Code/Testing/mitkSurfaceToSurfaceFilterTest.cpp

Core/Code/Testing/mitkTimeGeometryTest.cpp

Core/Code/Testing/mitkTimeSlicedGeometryTest.cpp

Merge branch 'bug-14892-Release201309-Integration' into bug-14892-MergeBranch
52ede3c5f3bc
Actions