HomePhabricator
Diffusion MITK e2cb3178c869

Merge branch 'master' into bug-18250-MovieMaker

Description

Merge branch 'master' into bug-18250-MovieMaker

Conflicts:
Plugins/org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc

Details

Provenance
kislinskAuthored on Nov 5 2014, 10:21 PM
Parents
rMITK3243d0ffa292: WIP
rMITKfb0d96fea011: Merge branch 'bug-18392-add-missing-icon'
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.