Diffusion MITK 7a41346ff8c9

Fixing merge errors
7a41346ff8c9
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Fixing merge errors

Details

Provenance

Authored on Aug 5 2014, 10:21 AM

Parents

rMITKc68283149c33: Merge branch 'bug-17968-GetViewTree' into bug-17968-NavigatorView

Branches

Unknown

Tags

Unknown

Event Timeline

goetzm committed rMITK7a41346ff8c9: Fixing merge errors (authored by goetzm).Aug 5 2014, 10:21 AM

Changes (3)

Path

Size

Plugins/

org.mitk.gui.qt.viewbrowser/

src/

internal/

ViewBrowserView.cpp

mitkQtPerspectiveItem.h

mitkQtViewItem.h

rMITK7a41346ff8c9

Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.cpp

Loading...

Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtPerspectiveItem.h

Loading...

Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtViewItem.h

Loading...