Merge branch 'T18971-Integration-2017-06' into T22595-NavigationModules-2016-11
f3f27ea9d655
Actions

Description

Merge branch 'T18971-Integration-2017-06' into T22595-NavigationModules-2016-11

Details

Provenance

franza	Authored on Jun 9 2017, 4:22 PM
franza	Pushed on Jun 9 2017, 4:54 PM

Differential Revision

Restricted Differential Revision

Parents

rMITK6f6712b29a81: COMP: added code which was lost at some place and caused a compiler error
rMITK61f1f33383ae: Merge remote-tracking branch 'remotes/origin/bug-18971-saveIGTFiledialogPath'…

Branches

Tags

Event Timeline

franza committed rMITKf3f27ea9d655: Merge branch 'T18971-Integration-2017-06' into T22595-NavigationModules-2016-11 (authored by franza).Jun 9 2017, 4:22 PM

Merged Changes

Changes (10)

Path

Size

Modules/

IGTUI/

Qmitk/

QmitkIGTCommonHelper.cpp

QmitkIGTCommonHelper.h

QmitkIGTConnectionWidget.cpp

QmitkIGTPlayerWidget.cpp

QmitkMicronTrackerWidget.cpp

QmitkNDIConfigurationWidget.cpp

QmitkNPOptitrackWidget.cpp

QmitkNavigationToolCreationWidget.cpp

QmitkNavigationToolManagementWidget.cpp

files.cmake

rMITKf3f27ea9d655

View Options

Modules/IGTUI/Qmitk/QmitkIGTCommonHelper.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTCommonHelper.h

View Options

Modules/IGTUI/Qmitk/QmitkIGTConnectionWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNDIConfigurationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

View Options

Merge branch 'T18971-Integration-2017-06' into T22595-NavigationModules-2016-11f3f27ea9d655Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITKf3f27ea9d655

Modules/IGTUI/Qmitk/QmitkIGTCommonHelper.cpp

Modules/IGTUI/Qmitk/QmitkIGTCommonHelper.h

Modules/IGTUI/Qmitk/QmitkIGTConnectionWidget.cpp

Modules/IGTUI/Qmitk/QmitkIGTPlayerWidget.cpp

Modules/IGTUI/Qmitk/QmitkMicronTrackerWidget.cpp

Modules/IGTUI/Qmitk/QmitkNDIConfigurationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNPOptitrackWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolManagementWidget.cpp

Modules/IGTUI/files.cmake

Merge branch 'T18971-Integration-2017-06' into T22595-NavigationModules-2016-11
f3f27ea9d655
Actions