Diffusion MITK 7b515a14f922

Fixed merge problems
7b515a14f922
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Fixed merge problems

Details

Provenance

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

Parents

rMITK54cf0c60b47d: Merge remote-tracking branch 'remotes/origin/T23735-SpeedUpKinectV2Integration'…

Branches

Loading...

Tags

Loading...

Event Timeline

franza committed rMITK7b515a14f922: Fixed merge problems (authored by franza).Jan 9 2018, 10:50 PM

Changes (2)

Path

Size

Modules/

IGTUI/

Qmitk/

QmitkInteractiveTransformationWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

rMITK7b515a14f922

Modules/IGTUI/Qmitk/QmitkInteractiveTransformationWidget.cpp

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Loading...