HomePhabricator
Diffusion MITK b472328e2bfd

Merge branch 'bug-8507-PortImageStatisticsBundleToCTK'
b472328e2bfd
Actions

Description

Merge branch 'bug-8507-PortImageStatisticsBundleToCTK'

Conflicts:
Modules/Bundles/CMakeLists.txt
Modules/Bundles/PluginList.cmake

Details

Provenance
Diana Wald <d.wald@dkfz-heidelberg.de>Authored on Jun 15 2011, 3:24 PM
Parents
rMITK92147366fff2: Converted ImageStatistics Bundle to a CTK plugin
rMITK645aef9ed9a5: Merge branch 'bug-2442-enhancemitkPointLocatorTest'
Branches
Unknown
Tags
Unknown

Event Timeline

Diana Wald <d.wald@dkfz-heidelberg.de> committed rMITKb472328e2bfd: Merge branch 'bug-8507-PortImageStatisticsBundleToCTK' (authored by Diana Wald <d.wald@dkfz-heidelberg.de>).Jun 15 2011, 3:24 PM

Merged Changes

Changes (13)

PathSize
Modules/
Bundles/
org.mitk.gui.qt.imagestatistics/
src/
internal/
Modules/
Bundles/
org.mitk.gui.qt.imagestatistics/
BlueBerry/
Testing/
org.blueberry.ui.tests/

rMITKb472328e2bfd

View Options

Modules/Bundles/CMakeLists.txt

Loading...
View Options

Modules/Bundles/PluginList.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/CMakeLists.txt

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/META-INF

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/META-INF/MANIFEST.MF

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/files.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/manifest.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/manifest_headers.cmake

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/plugin.xml

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/src/ImageStatisticsDll.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/src/internal/QmitkImageStatisticsView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/src/internal/mitkImageStatisticsPluginActivator.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagestatistics/src/internal/mitkImageStatisticsPluginActivator.h

Loading...
MITK · MIC · IMSY · DKFZ