HomePhabricator
Diffusion MITK bc41ea7dddb8

Merge remote-tracking branch 'origin/bug-19608-PhotoacousticSimulations' into…

Description

Merge remote-tracking branch 'origin/bug-19608-PhotoacousticSimulations' into T19608-PhotoacousticSimulationIntegrationBranch

Conflicts:
Modules/ModuleList.cmake
Plugins/PluginList.cmake

Details

Provenance
groehlAuthored on Dec 14 2016, 3:24 PM
groehlPushed on Dec 14 2016, 3:24 PM
Parents
rMITK86fed9888ad2: fixed tests
rMITKe9fc317feee1: Merge branch 'T22251-ActivateAnnotationTests'
Branches
Unknown
Tags
Unknown

Merged Changes

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