Diffusion MITK 627bd344929c

Merge branch 'master' into T23292-sort-data-manager-context-menu-extensions…
627bd344929c
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' into T23292-sort-data-manager-context-menu-extensions-MASTER

Resolved conflict in QmitkDataManagerView: icon resolution had been changed in master.

Signed-off-by: Daniel Maleike <code@maleike.de>

Conflicts:
Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Details

Provenance

maleike	Authored on Aug 24 2017, 10:59 AM
• goch	Committed on Sep 14 2017, 11:49 AM
• goch	Pushed on Sep 14 2017, 11:57 AM
• goch	Pushed on Sep 14 2017, 11:57 AM

Parents

rMITK25f2e7060560: Replace department logo

Branches

Unknown

Tags

Unknown

Event Timeline

• goch committed rMITK627bd344929c: Merge branch 'master' into T23292-sort-data-manager-context-menu-extensions… (authored by maleike).Sep 14 2017, 11:49 AM

Changes (2)

Path

Size

Packages

Plugins/

org.mitk.gui.qt.datamanager/

src/

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

QmitkDataManagerView.h

O1: MITK Reviewer Group I

rMITK627bd344929c

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Loading...

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h

Loading...