HomePhabricator
Diffusion MITK 3c64636697ff

Merge branch 'bug-18250-MovieMaker' of mitk.org:MITK into bug-18250-MovieMaker

Description

Merge branch 'bug-18250-MovieMaker' of mitk.org:MITK into bug-18250-MovieMaker

Conflicts:
Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerView.h

Details

Provenance
kislinskAuthored on Nov 25 2014, 11:19 PM
Parents
rMITK8df0ae8c1d2c: WIP
rMITKed5887088315: Made new movie maker plugin ready for release (experimental).
Branches
Unknown
Tags
Unknown