HomePhabricator
Diffusion MITK 107fd9d82fe5

Merge branch 'personal/cordes/final-plugin-integration' into T19168…
107fd9d82fe5
Actions

This commit no longer exists in the repository. It may have been part of a branch which was deleted.This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.

Description

Merge branch 'personal/cordes/final-plugin-integration' into T19168-CleanPluginIntegration

  1. Conflicts:
  2. Modules/Classification/CLMiniApps/CMakeLists.txt
  3. Modules/Classification/CLVigraRandomForest/src/mitkCLVigraRandomForestModuleActivator.cpp
  4. Modules/Classification/CLVigraRandomForest/src/mitkModuleActivator.cpp
  5. Modules/Classification/CLWorkflowICH/src/mitkModuleActivator.cpp
  6. Modules/Classification/CLWorkflowICH/test/CMakeLists.txt
  7. Modules/Classification/CMakeLists.txt
  8. Plugins/org.mitk.gui.qt.classificationsegmentation/CMakeLists.txt
  9. Plugins/org.mitk.gui.qt.classificationsegmentation/documentation/UserManual/Manual.dox
  10. Plugins/org.mitk.gui.qt.classificationsegmentation/files.cmake
  11. Plugins/org.mitk.gui.qt.classificationsegmentation/manifest_headers.cmake
  12. Plugins/org.mitk.gui.qt.classificationsegmentation/plugin.xml
  13. Plugins/org.mitk.gui.qt.classificationsegmentation/resources/ClassificationSegmentation.qrc
  14. Plugins/org.mitk.gui.qt.classificationsegmentation/src/internal/ClassificationSegmentation.cpp
  15. Plugins/org.mitk.gui.qt.classificationsegmentation/src/internal/ClassificationSegmentation.h
  16. Plugins/org.mitk.gui.qt.classificationsegmentation/src/internal/ClassificationSegmentationControls.ui
  17. Plugins/org.mitk.gui.qt.classificationsegmentation/src/internal/org_mitk_gui_qt_classificationsegmentation_Activator.h

Details

Provenance
• cordesAuthored on Sep 9 2016, 6:09 PM
• cordesPushed on Sep 21 2016, 11:38 AM

Commit No Longer Exists

This commit no longer exists in the repository.
MITK · MIC · IMSY · DKFZ