Diffusion MITK 6949c3ff0ceb

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…
6949c3ff0ceb
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02-22' into T24287-v2018.04-beta-integration

Conflicts:
Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationMarkerPlacement.cpp

Details

Provenance

franza	Authored on Aug 7 2018, 3:10 PM
franza	Pushed on Aug 7 2018, 9:32 PM

Parents

rMITK6ba28ab78f25: added initialization method so the navigation steps can be independent
rMITK215979debce3: fixed some merge-related problems

Branches

Loading...

Tags

Loading...

Event Timeline

franza committed rMITK6949c3ff0ceb: Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02… (authored by franza).Aug 7 2018, 3:10 PM

Merged Changes

6ba28ab78f25 added initialization method so the navigation steps can be independent
Author
franza
Browse Repository
No Builds
No Audits

Changes (3)

Path

Size

Plugins/

org.mitk.gui.qt.igt.app.echotrack/

src/

internal/

NavigationStepWidgets/

QmitkUSNavigationStepPunctuationIntervention.cpp

QmitkUSNavigationMarkerPlacement.cpp

QmitkUSNavigationMarkerPlacement.h

rMITK6949c3ff0ceb

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepPunctuationIntervention.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationMarkerPlacement.cpp

Loading...

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUSNavigationMarkerPlacement.h

Loading...