fixed some merge-related problems
215979debce3
Actions

Description

fixed some merge-related problems

Details

Provenance

franza	Authored on Aug 7 2018, 1:47 PM
franza	Pushed on Aug 7 2018, 2:42 PM

Parents

rMITK81d4807489f1: Merge remote-tracking branch 'remotes/origin/T24287-Integration-IGTRelease-2018…

Branches

Tags

Event Timeline

franza committed rMITK215979debce3: fixed some merge-related problems (authored by franza).Aug 7 2018, 1:47 PM

Changes (5)

Path

Size

Modules/

US/

USModel/

mitkUSDevice.h

mitkUSVideoDevice.h

USNavigation/

	mitkUSCombinedModality.cpp
	mitkTrackedUltrasound.cpp

	mitkUSCombinedModality.h
	mitkTrackedUltrasound.h

Plugins/

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

src/

internal/

QmitkUltrasoundCalibration.cpp

rMITK215979debce3

View Options

Modules/US/USModel/mitkUSDevice.h

View Options

Modules/US/USModel/mitkUSVideoDevice.h

View Options

Modules/US/USNavigation/mitkUSCombinedModality.cpp

View Options

Modules/US/USNavigation/mitkUSCombinedModality.h

View Options

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

fixed some merge-related problems215979debce3Actions

Description

Details

Event Timeline

Changes (5)

rMITK215979debce3

Modules/US/USModel/mitkUSDevice.h

Modules/US/USModel/mitkUSVideoDevice.h

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Modules/US/USNavigation/mitkUSCombinedModality.h

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

fixed some merge-related problems
215979debce3
Actions