Merge branch 'T22572-Fixes'
7e7aa1d5edc9
Actions

Description

Merge branch 'T22572-Fixes'

Details

Provenance

kislinsk	Authored on Apr 28 2017, 2:57 PM
kislinsk	Pushed on Apr 28 2017, 2:57 PM

Parents

rMITK9ab385913c2b: Fixed merge conflicts
rMITK035694655435: Merge branch 'T19751-AddExportMakros'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK7e7aa1d5edc9: Merge branch 'T22572-Fixes' (authored by kislinsk).Apr 28 2017, 2:57 PM

Merged Changes

9ab385913c2b Fixed merge conflicts
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

Plugins/

org.mitk.gui.qt.diffusionimaging.odfpeaks/

src/

internal/

QmitkOdfMaximaExtractionView.cpp

org.mitk.gui.qt.diffusionimaging.tbss/

plugin.xml

org.mitk.gui.qt.diffusionimaging.tractography/

src/

internal/

QmitkStreamlineTrackingView.cpp

org.mitk.gui.qt.ugvisualization/

src/

internal/

QmitkUGVisualizationView.cpp

rMITK7e7aa1d5edc9

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tbss/plugin.xml

View Options

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp

View Options

Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.cpp

Merge branch 'T22572-Fixes'7e7aa1d5edc9Actions

Description

Details

Event Timeline

Merged Changes

Changes (4)

rMITK7e7aa1d5edc9

Plugins/org.mitk.gui.qt.diffusionimaging.odfpeaks/src/internal/QmitkOdfMaximaExtractionView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging.tbss/plugin.xml

Plugins/org.mitk.gui.qt.diffusionimaging.tractography/src/internal/QmitkStreamlineTrackingView.cpp

Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.cpp

Merge branch 'T22572-Fixes'
7e7aa1d5edc9
Actions