Merge branch 'T19560-Integration-2016-10-10'
- Conflicts:
- Plugins/PluginList.cmake
Paths
|
Merge branch 'T19560-Integration-2016-10-10'
Tags None Referenced Files None Subscribers None
Description Merge branch 'T19560-Integration-2016-10-10'
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (40)
rMITKb3c60dec25a4 Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/Manual/Manual.doxLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/Manual/pipeline.pngLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/Manual/screenshot.pngLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/documentation/doxygen/modules.doxLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/QmitkIGTTrackingSemiAutomaticMeasurementView.qrcLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementEvaluation.svgLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/resources/iconMeasurementTracking.svgLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingDataEvaluationView.cppLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingDataEvaluationView.hLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingDataEvaluationViewControls.uiLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingSemiAutomaticMeasurementView.cppLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingSemiAutomaticMeasurementView.hLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingSemiAutomaticMeasurementViewControls.uiLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkHummelProtocolEvaluation.cppLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkHummelProtocolEvaluation.hLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkNavigationDataCSVSequentialPlayer.cppLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkNavigationDataCSVSequentialPlayer.hLoading... Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkPluginActivator.cppLoading... |