Diffusion MITK 9d64a6acbeee

Merge branch 'bug-14224-DefaultCalibrationFiles'
9d64a6acbeee
Actions

Description

Merge branch 'bug-14224-DefaultCalibrationFiles'

Conflicts:
CMakeExternals/MITKData.cmake

Details

Provenance

• iszatt

Authored on Feb 19 2013, 10:41 AM

Parents

rMITKc00b8dc6a40e: changed the revisionTag to fit to the new mitk data
rMITK9c86027bad79: Merge branch 'bug-14513-failing-xcode-superbuild'

Branches

Unknown

Tags

Unknown

Event Timeline

• iszatt committed rMITK9d64a6acbeee: Merge branch 'bug-14224-DefaultCalibrationFiles' (authored by • iszatt).Feb 19 2013, 10:41 AM

Changes (23)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

	MITKData.cmake.BACKUP.9452.cmake
	MITKData.cmake

O1: MITK Reviewer Group I

	MITKData.cmake.BASE.9452.cmake
	MITKData.cmake

O1: MITK Reviewer Group I

	MITKData.cmake.LOCAL.9452.cmake
	MITKData.cmake

O1: MITK Reviewer Group I

	MITKData.cmake.REMOTE.9452.cmake
	MITKData.cmake

O1: MITK Reviewer Group I

Modules/

ToFHardware/

CMakeLists.txt

Documentation

doxygen

GeneratingDeviceModules.dox

Kinect/

mitkKinectDevice.h

mitkKinectDeviceFactory.h

MesaSR4000/

mitkToFCameraMESASR4000DeviceFactory.h

PMD/

mitkToFCameraPMDCamBoardDeviceFactory.h

mitkToFCameraPMDCamCubeDeviceFactory.h

mitkToFCameraPMDO3DeviceFactory.h

mitkToFCameraPMDPlayerDeviceFactory.h

mitkToFCameraPMDRawDataCamBoardDeviceFactory.h

mitkToFCameraPMDRawDataCamCubeDeviceFactory.h

mitkToFCameraMITKPlayerDeviceFactory.h

mitkToFCameraPMDCamBoardControllerStub.cpp

mitkToFCameraPMDCamCubeControllerStub.cpp

ToFUI/

Qmitk/

QmitkToFConnectionWidget.cpp

Plugins/

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

rMITK9d64a6acbeee

View Options

CMakeExternals/MITKData.cmake

View Options

CMakeExternals/MITKData.cmake.BACKUP.9452.cmake

View Options

CMakeExternals/MITKData.cmake.BASE.9452.cmake

View Options

CMakeExternals/MITKData.cmake.LOCAL.9452.cmake

View Options

CMakeExternals/MITKData.cmake.REMOTE.9452.cmake

View Options

Modules/ToFHardware/CMakeLists.txt

View Options

Modules/ToFHardware/Documentation/doxygen/GeneratingDeviceModules.dox

View Options

Modules/ToFHardware/Kinect/mitkKinectDevice.h

View Options

Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h

View Options

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardDeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDCamCubeDeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDO3DeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDPlayerDeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamBoardDeviceFactory.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamCubeDeviceFactory.h

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerDeviceFactory.h

View Options

Modules/ToFHardware/mitkToFCameraPMDCamBoardControllerStub.cpp

View Options

Modules/ToFHardware/mitkToFCameraPMDCamCubeControllerStub.cpp

View Options

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Merge branch 'bug-14224-DefaultCalibrationFiles'9d64a6acbeeeActions

Description

Details

Event Timeline

Merged Changes

Changes (23)

rMITK9d64a6acbeee

CMakeExternals/MITKData.cmake

CMakeExternals/MITKData.cmake.BACKUP.9452.cmake

CMakeExternals/MITKData.cmake.BASE.9452.cmake

CMakeExternals/MITKData.cmake.LOCAL.9452.cmake

CMakeExternals/MITKData.cmake.REMOTE.9452.cmake

Modules/ToFHardware/CMakeLists.txt

Modules/ToFHardware/Documentation/doxygen/GeneratingDeviceModules.dox

Modules/ToFHardware/Kinect/mitkKinectDevice.h

Modules/ToFHardware/Kinect/mitkKinectDeviceFactory.h

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000DeviceFactory.h

Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardDeviceFactory.h

Modules/ToFHardware/PMD/mitkToFCameraPMDCamCubeDeviceFactory.h

Modules/ToFHardware/PMD/mitkToFCameraPMDO3DeviceFactory.h

Modules/ToFHardware/PMD/mitkToFCameraPMDPlayerDeviceFactory.h

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamBoardDeviceFactory.h

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataCamCubeDeviceFactory.h

Modules/ToFHardware/mitkToFCameraMITKPlayerDeviceFactory.h

Modules/ToFHardware/mitkToFCameraPMDCamBoardControllerStub.cpp

Modules/ToFHardware/mitkToFCameraPMDCamCubeControllerStub.cpp

Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Merge branch 'bug-14224-DefaultCalibrationFiles'
9d64a6acbeee
Actions