Merge branch 'bug-8518-PortMaterialEditorBundleToCTK'
1428ee016021
Actions

Description

Merge branch 'bug-8518-PortMaterialEditorBundleToCTK'

Details

Provenance

Authored on Jun 15 2011, 3:44 PM

Parents

rMITKc8fa1516b333: Converted MaterialEditor Bundle to a CTK plugin
rMITK25f7e579f21e: Merge branch 'bug-8516-TrackingDeviceSourceConfiguratorBugs'

Branches

Unknown

Tags

Unknown

Event Timeline

Diana Wald <d.wald@dkfz-heidelberg.de> committed rMITK1428ee016021: Merge branch 'bug-8518-PortMaterialEditorBundleToCTK' (authored by Diana Wald <d.wald@dkfz-heidelberg.de>).Jun 15 2011, 3:44 PM

Merged Changes

c8fa1516b333 Converted MaterialEditor Bundle to a CTK plugin
Author
Diana Wald <d.wald@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Modules/

Bundles/

CMakeLists.txt

PluginList.cmake

org.mitk.gui.qt.materialeditor/

src/

internal/

QmitkMITKSurfaceMaterialEditorView.h

mitkMaterialEditorPluginActivator.cpp

	org.mitk.gui.qt.materialeditor/	src/	internal/
	org.mitk.gui.qt.imagenavigator/	src/	internal/

	mitkMaterialEditorPluginActivator.h
	mitkImageNavigatorPluginActivator.h

	Modules/	Bundles/	org.mitk.gui.qt.materialeditor/
	BlueBerry/	Testing/	org.blueberry.osgi.tests/

manifest_headers.cmake

rMITK1428ee016021

View Options

Modules/Bundles/CMakeLists.txt

View Options

Modules/Bundles/PluginList.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/MaterialeditorDll.h

View Options

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h

View Options

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.h

Merge branch 'bug-8518-PortMaterialEditorBundleToCTK'1428ee016021Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITK1428ee016021

Modules/Bundles/CMakeLists.txt

Modules/Bundles/PluginList.cmake

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

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

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

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

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

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

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

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/MaterialeditorDll.h

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.cpp

Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.h

Merge branch 'bug-8518-PortMaterialEditorBundleToCTK'
1428ee016021
Actions