HomePhabricator
Diffusion MITK 34a2590adce3

Merge branch 'T19560-PolhemusMeasurementsEvaluationBranch' into T19560…

Description

Merge branch 'T19560-PolhemusMeasurementsEvaluationBranch' into T19560-Integration-2016-10-10

  1. Conflicts:
  2. Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/QmitkIGTTrackingDataEvaluationView.cpp
  3. Plugins/org.mitk.gui.qt.igt.app.hummelprotocolmeasurements/src/internal/mitkNavigationDataCSVSequentialPlayer.cpp

Details

Provenance
franzaAuthored on Apr 19 2017, 10:57 AM
franzaPushed on Apr 19 2017, 10:57 AM
Parents
rMITK51ab0b8a8ef3: fixed a few bugs in hummel protocol evaluation class
rMITKd47eb4999c6b: changed back to Aurora specific code
Branches
Unknown
Tags
Unknown