HomePhabricator
Diffusion MITK bec425cfbd22

Merge branch 'bug-10773-IntegrationBranchKinect'

Description

Merge branch 'bug-10773-IntegrationBranchKinect'

Conflicts:
Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp
Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h

Details

Provenance
kilgusAuthored on Aug 2 2012, 4:30 PM
Parents
rMITK656072fbbaeb: Removed legacy dependency
rMITK7dc57b6d57e6: Merge branch 'bug-12682-Fix-PixelType-CMakeConfig'
Branches
Unknown
Tags
Unknown