Diffusion MITK 9d7c2e602eb4

Merge conflicts fixed
9d7c2e602eb4
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge conflicts fixed

Details

Provenance

• sridhara	Authored on Apr 20 2018, 10:11 AM
• sridhara	Pushed on Apr 20 2018, 10:12 AM

Parents

rMITK079a3dd37298: Fixed merge conflict

Branches

Loading...

Tags

Loading...

Event Timeline

• sridhara committed rMITK9d7c2e602eb4: Merge conflicts fixed (authored by • sridhara).Apr 20 2018, 10:11 AM

Changes (5)

Path

Size

Modules/

US/

USModel/

mitkUSDevice.cpp

mitkUSDeviceWriterXML.cpp

USUI/

Qmitk/

QmitkUSNewVideoDeviceWidget.cpp

Plugins/

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

src/

internal/

QmitkUltrasoundCalibration.cpp

rMITK9d7c2e602eb4

Modules/US/USModel/mitkUSDevice.cpp

Loading...

Modules/US/USModel/mitkUSDevice.h

Loading...

Modules/US/USModel/mitkUSDeviceWriterXML.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

Loading...

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

Loading...