Diffusion MITK 469ff1d4176e

Merge remote-tracking branch 'origin/bug-19342…
469ff1d4176e
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'origin/bug-19342-ExampleScreenshotMakerFileExtension' into bug-19342-ExampleScreenshotMakerFileExtension-Integration

Conflicts:
Examples/Plugins/org.mitk.example.gui.imaging/src/internal/simpleexample/QmitkSimpleExampleView.cpp

Details

Provenance

Authored on Jul 6 2016, 3:02 PM

Parents

rMITK2c29162e29df: Make Screenshot Maker able to handle '.' in file name
rMITKe550e6adaed1: Merge branch 'bug-19386-SimpleExample3DStereoScene'

Branches

Unknown

Tags

Unknown

Event Timeline

eisenman committed rMITK469ff1d4176e: Merge remote-tracking branch 'origin/bug-19342… (authored by eisenman).Jul 6 2016, 3:02 PM

Merged Changes

2c29162e29df Make Screenshot Maker able to handle '.' in file name
Author
eisenman
Browse Repository
No Builds
No Audits

Changes (2)

Path

Size

Examples/

Plugins/

org.mitk.example.gui.imaging/

src/

internal/

simpleexample/

QmitkSimpleExampleView.cpp

QmitkSimpleExampleView.h

rMITK469ff1d4176e

Examples/Plugins/org.mitk.example.gui.imaging/src/internal/simpleexample/QmitkSimpleExampleView.cpp

Loading...

Examples/Plugins/org.mitk.example.gui.imaging/src/internal/simpleexample/QmitkSimpleExampleView.h

Loading...