HomePhabricator
Diffusion MITK 4f5421d0157a

Merge branch 'bug-17968-CandyStore' into bug-17968-NavigatorView

Description

Merge branch 'bug-17968-CandyStore' into bug-17968-NavigatorView

Conflicts:
Plugins/org.mitk.gui.qt.ext/src/QmitkCandyStoreWidget.cpp
Plugins/org.mitk.gui.qt.ext/src/QmitkCandyStoreWidget.h

Details

Provenance
neherAuthored on Aug 10 2014, 1:50 PM
Parents
rMITK9ea2156c2777: added expand and collapse all menu entries
rMITKc3263b64e577: Small fix
Branches
Unknown
Tags
Unknown