Diffusion MITK 8e701e687146

Merge branch 'bug-8446-PortToolPairNavigation'
8e701e687146
Actions

Description

Merge branch 'bug-8446-PortToolPairNavigation'

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

Details

Provenance

gergel

Authored on Jun 8 2011, 4:36 PM

Parents

rMITK5849779130fa: convert bundle to CTK plugin
rMITK497aebff258d: Merge branch 'bug-8325-TrackingDeviceSourceConfiguratorFurtherTestImprovement'

Branches

Unknown

Tags

Unknown

Event Timeline

gergel committed rMITK8e701e687146: Merge branch 'bug-8446-PortToolPairNavigation' (authored by gergel).Jun 8 2011, 4:36 PM

Merged Changes

5849779130fa convert bundle to CTK plugin
Author
gergel
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Modules/

Bundles/

CMakeLists.txt

PluginList.cmake

org.mitk.gui.qt.igttoolpairnavigation/

src/

IgttoolpairnavigationDll.h

internal/

QmitkToolPairNavigationView.h

mitkToolPairNavigationPluginActivator.cpp

	org.mitk.gui.qt.igttoolpairnavigation/
	org.mitk.gui.qt.datamanager/

manifest_headers.cmake

	Modules/	Bundles/	org.mitk.gui.qt.igttoolpairnavigation/	src/	internal/
	CoreUI/	BundleTesting/	org.mitk.gui.qt.common.tests/	src/	internal/

	mitkToolPairNavigationPluginActivator.h
	mitkPluginActivator.h

rMITK8e701e687146

View Options

Modules/Bundles/CMakeLists.txt

View Options

Modules/Bundles/PluginList.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/IgttoolpairnavigationDll.h

View Options

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/QmitkToolPairNavigationView.h

View Options

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/mitkToolPairNavigationPluginActivator.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/mitkToolPairNavigationPluginActivator.h

Merge branch 'bug-8446-PortToolPairNavigation'8e701e687146Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITK8e701e687146

Modules/Bundles/CMakeLists.txt

Modules/Bundles/PluginList.cmake

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

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

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

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

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

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

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

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/IgttoolpairnavigationDll.h

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/QmitkToolPairNavigationView.h

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/mitkToolPairNavigationPluginActivator.cpp

Modules/Bundles/org.mitk.gui.qt.igttoolpairnavigation/src/internal/mitkToolPairNavigationPluginActivator.h

Merge branch 'bug-8446-PortToolPairNavigation'
8e701e687146
Actions