HomePhabricator
Diffusion MITK dd5c3204b0bc

Merge branch 'personal/floca/matchpoint-integration-2' into T20000-MatchPoint…

Description

Merge branch 'personal/floca/matchpoint-integration-2' into T20000-MatchPoint-Integration

Conflicts:
Plugins/PluginList.cmake

Details

Provenance
flocaAuthored on Sep 20 2016, 6:38 PM
flocaPushed on Sep 20 2016, 6:38 PM
Parents
rMITK71d640a65e23: fixed problem due to API change.
rMITK6bb030e1c3b2: remove deactivated code from mitkInstallRules.cmake
Branches
Unknown
Tags
Unknown

Merged Changes