Merge branch 'bug-16645-RemoveToDosFromToFCode'
24ac549ff032
Actions

Description

Merge branch 'bug-16645-RemoveToDosFromToFCode'

Conflicts:
Modules/ToFHardware/Kinect/mitkKinectDevice.cpp
Modules/ToFHardware/Kinect/mitkKinectDevice.h
Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp
Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.h

Details

Provenance

Esther Wild <e.wild@dkfz.de>

Authored on Mar 11 2014, 5:40 PM

Parents

rMITK515f4c58f02f: Removed ToDos from code in ToFHardware.
rMITK5874a5df6e4a: Merge branch 'bug-17455-tofcameraintrinsicscrash'

Branches

Unknown

Tags

Unknown

Event Timeline

• wildes committed rMITK24ac549ff032: Merge branch 'bug-16645-RemoveToDosFromToFCode' (authored by • wildes).Mar 11 2014, 5:40 PM

Merged Changes

515f4c58f02f Removed ToDos from code in ToFHardware.
Author
seitela
Browse Repository
No Builds
No Audits

Changes (20)

Path

Size

Modules/

ToFHardware/

Kinect/

mitkKinectDevice.cpp

MesaSR4000/

mitkToFCameraMESAController.h

mitkToFCameraMESADevice.cpp

mitkToFCameraMESADevice.h

mitkToFCameraMESASR4000Controller.cpp

PMD/

Testing/

mitkToFCameraPMDPlayerControllerTest.cpp

mitkToFCameraPMDCamBoardController.cpp

mitkToFCameraPMDCamCubeController.cpp

mitkToFCameraPMDController.cpp

mitkToFCameraPMDController.h

mitkToFCameraPMDDevice.cpp

mitkToFCameraPMDDevice.h

mitkToFCameraPMDO3Controller.cpp

mitkToFCameraPMDPlayerController.cpp

mitkToFCameraPMDRawDataDevice.cpp

mitkToFCameraPMDRawDataDevice.h

mitkToFCameraDevice.h

mitkToFCameraMITKPlayerDevice.cpp

mitkToFHardwareActivator.cpp

mitkToFOpenCVImageGrabber.cpp

rMITK24ac549ff032

View Options

Modules/ToFHardware/Kinect/mitkKinectDevice.cpp

View Options

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESAController.h

View Options

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESADevice.cpp

View Options

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESADevice.h

View Options

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000Controller.cpp

View Options

Modules/ToFHardware/PMD/Testing/mitkToFCameraPMDPlayerControllerTest.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardController.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDCamCubeController.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDController.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDController.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDDevice.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDDevice.h

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDO3Controller.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDPlayerController.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataDevice.cpp

View Options

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataDevice.h

View Options

Modules/ToFHardware/mitkToFCameraDevice.h

View Options

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

View Options

Modules/ToFHardware/mitkToFHardwareActivator.cpp

View Options

Modules/ToFHardware/mitkToFOpenCVImageGrabber.cpp

Merge branch 'bug-16645-RemoveToDosFromToFCode'24ac549ff032Actions

Description

Details

Event Timeline

Merged Changes

Changes (20)

rMITK24ac549ff032

Modules/ToFHardware/Kinect/mitkKinectDevice.cpp

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESAController.h

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESADevice.cpp

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESADevice.h

Modules/ToFHardware/MesaSR4000/mitkToFCameraMESASR4000Controller.cpp

Modules/ToFHardware/PMD/Testing/mitkToFCameraPMDPlayerControllerTest.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDCamBoardController.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDCamCubeController.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDController.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDController.h

Modules/ToFHardware/PMD/mitkToFCameraPMDDevice.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDDevice.h

Modules/ToFHardware/PMD/mitkToFCameraPMDO3Controller.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDPlayerController.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataDevice.cpp

Modules/ToFHardware/PMD/mitkToFCameraPMDRawDataDevice.h

Modules/ToFHardware/mitkToFCameraDevice.h

Modules/ToFHardware/mitkToFCameraMITKPlayerDevice.cpp

Modules/ToFHardware/mitkToFHardwareActivator.cpp

Modules/ToFHardware/mitkToFOpenCVImageGrabber.cpp

Merge branch 'bug-16645-RemoveToDosFromToFCode'
24ac549ff032
Actions