T23735-SpeedUpKinectV2Integration'…
54cf0c60b47d
Actions

Description

Merge remote-tracking branch 'remotes/origin/T23735-SpeedUpKinectV2Integration' into T22595-Masterintegration-2018-01-09

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

Details

Provenance

franza	Authored on Jan 9 2018, 8:35 PM
franza	Pushed on Jan 9 2018, 10:56 PM

Parents

rMITK60df42cb2c75: Merge remote-tracking branch 'remotes/origin/T23980…
rMITK0b5540ef5e5d: made console output optional

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK54cf0c60b47d: Merge remote-tracking branch 'remotes/origin/T23735-SpeedUpKinectV2Integration'… (authored by franza).Jan 9 2018, 8:35 PM

Merged Changes

0b5540ef5e5d made console output optional
Author
franza
Browse Repository
No Builds
No Audits
fdb92aa44806 removed deep copy, made console output optional
Author
franza
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

Modules/

ToFHardware/

KinectV2/

mitkKinectV2Device.cpp

mitkKinectV2Device.h

Plugins/

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

QmitkToFUtilView.h

rMITK54cf0c60b47d

View Options

Modules/ToFHardware/KinectV2/mitkKinectV2Device.cpp

View Options

Modules/ToFHardware/KinectV2/mitkKinectV2Device.h

View Options

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

View Options

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

Merge remote-tracking branch 'remotes/origin/T23735-SpeedUpKinectV2Integration'…54cf0c60b47dActions

Description

Details

Event Timeline

Merged Changes

Changes (4)

rMITK54cf0c60b47d

Modules/ToFHardware/KinectV2/mitkKinectV2Device.cpp

Modules/ToFHardware/KinectV2/mitkKinectV2Device.h

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

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

Merge remote-tracking branch 'remotes/origin/T23735-SpeedUpKinectV2Integration'…
54cf0c60b47d
Actions