Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of mitk.org:MITK into bug-15959-NavigationdataplayerRedesignIntegrationBranch
Conflicts:
Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp
Merge branch 'bug-15959-NavigationdataplayerRedesignIntegrationBranch' of… Tags None Referenced Files None Subscribers None
Description
Details
Merged Changes |