Diffusion MITK 2092cef5ebeb

T24287-MasterIntegration-2018-02…
2092cef5ebeb
Actions

Description

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02-22' into T24287-Integration-IGTRelease-2018-03

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

Details

Provenance

franza	Authored on Aug 6 2018, 7:25 PM
franza	Pushed on Aug 6 2018, 8:35 PM

Parents

rMITK73fa36ee6d4f: Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…
rMITK1b0f98cd88a2: clean up: removed class

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

1b0f98cd88a2 clean up: removed class
Author
franza
Browse Repository
No Builds
No Audits
fc03ecfcd0ec removed navigationProcessWidget from UI
Author
franza
Browse Repository
No Builds
No Audits
c5fc671e44a3 removed navigationProcessWidget from code
Author
franza
Browse Repository
No Builds
No Audits
19c3052f9086 some ui changes
Author
franza
Browse Repository
No Builds
No Audits

Changes (8)

Path

Size

Modules/

US/

USNavigation/

mitkTrackedUltrasound.cpp

Plugins/

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

files.cmake

src/

internal/

QmitkUSNavigationMarkerPlacement.cpp

QmitkUSNavigationMarkerPlacement.h

QmitkUSNavigationMarkerPlacement.ui

Widgets/

QmitkUSNavigationProcessWidget.cpp

QmitkUSNavigationProcessWidget.h

QmitkUSNavigationProcessWidget.ui

rMITK2092cef5ebeb

View Options

Modules/US/USNavigation/mitkTrackedUltrasound.cpp

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/files.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…2092cef5ebebActions

Description

Details

Event Timeline

Merged Changes

Changes (8)

rMITK2092cef5ebeb

Modules/US/USNavigation/mitkTrackedUltrasound.cpp

Plugins/org.mitk.gui.qt.igt.app.echotrack/files.cmake

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

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

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

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

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

Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/Widgets/QmitkUSNavigationProcessWidget.ui

Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02…
2092cef5ebeb
Actions