HomePhabricator
Diffusion MITK 99efde516441

Merge branch 'bug-8437-Port_MovieMaker_And_ImageNagivatorBundle_To_CTK'
99efde516441
Actions

Description

Merge branch 'bug-8437-Port_MovieMaker_And_ImageNagivatorBundle_To_CTK'

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

Details

Provenance
Diana Wald <d.wald@dkfz-heidelberg.de>Authored on Jun 9 2011, 10:02 AM
Parents
rMITK1b1969be167e: Set new CTK Plugins on exclude list
rMITK95db71562aea: Merge branch 'bug-8438-CTKConversionToFUtil'
Branches
Unknown
Tags
Unknown

Event Timeline

Diana Wald <d.wald@dkfz-heidelberg.de> committed rMITK99efde516441: Merge branch 'bug-8437-Port_MovieMaker_And_ImageNagivatorBundle_To_CTK' (authored by Diana Wald <d.wald@dkfz-heidelberg.de>).Jun 9 2011, 10:02 AM

Merged Changes

Changes (24)

PathSize
Modules/
Bundles/
org.mitk.gui.qt.imagenavigator/
src/
internal/
org.mitk.gui.qt.moviemaker/
src/
internal/
Modules/
Bundles/
BlueBerry/
Testing/
org.mitk.gui.qt.imagenavigator/
org.blueberry.osgi.tests/
org.mitk.gui.qt.moviemaker/
org.blueberry.osgi.tests/

rMITK99efde516441

View Options

Modules/Bundles/CMakeLists.txt

Loading...
View Options

Modules/Bundles/PluginList.cmake

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/ImagenavigatorDll.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.moviemaker/src/MoviemakerDll.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.h

Loading...
MITK · MIC · IMSY · DKFZ