Diffusion MITK 07e7cd63d179

Merge branch 'bug-8517-converting-simplemeasurement-bundle-to-ctk'
07e7cd63d179
Actions

Description

Merge branch 'bug-8517-converting-simplemeasurement-bundle-to-ctk'

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

Details

Provenance

• groch

Authored on Jun 16 2011, 10:38 AM

Parents

rMITK65e70a2fff40: changed and deleted all necessary files for the conversion of the simple…
rMITK53580c10f171: Merge branch 'bug-8445-converting-measurement-bundle-to-ctk'

Branches

Unknown

Tags

Unknown

Event Timeline

• groch committed rMITK07e7cd63d179: Merge branch 'bug-8517-converting-simplemeasurement-bundle-to-ctk' (authored by • groch).Jun 16 2011, 10:38 AM

Merged Changes

65e70a2fff40 changed and deleted all necessary files for the conversion of the simple…
Author
• groch
Browse Repository
No Builds
No Audits

Changes (12)

Path

Size

Modules/

Bundles/

CMakeLists.txt

PluginList.cmake

org.mitk.gui.qt.simplemeasurement/

src/

internal/

QmitkSimpleMeasurement.h

mitkQmitkSimpleMeasurementDll.h

	org.mitk.gui.qt.simplemeasurement/
	org.mitk.gui.qt.datamanager/

manifest_headers.cmake

	org.mitk.gui.qt.simplemeasurement/	src/	internal/
	org.mitk.gui.qt.simpleexample/	src/	internal/

mitkPluginActivator.cpp

	org.mitk.gui.qt.simplemeasurement/	src/	internal/
	org.mitk.gui.qt.igtnavigationtoolmanager/	src/	internal/

mitkPluginActivator.h

rMITK07e7cd63d179

View Options

Modules/Bundles/CMakeLists.txt

View Options

Modules/Bundles/PluginList.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/internal/QmitkSimpleMeasurement.h

View Options

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/internal/mitkPluginActivator.cpp

View Options

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/internal/mitkPluginActivator.h

View Options

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/mitkQmitkSimpleMeasurementDll.h

Merge branch 'bug-8517-converting-simplemeasurement-bundle-to-ctk'07e7cd63d179Actions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rMITK07e7cd63d179

Modules/Bundles/CMakeLists.txt

Modules/Bundles/PluginList.cmake

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

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

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

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

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

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

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/internal/QmitkSimpleMeasurement.h

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/internal/mitkPluginActivator.cpp

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/internal/mitkPluginActivator.h

Modules/Bundles/org.mitk.gui.qt.simplemeasurement/src/mitkQmitkSimpleMeasurementDll.h

Merge branch 'bug-8517-converting-simplemeasurement-bundle-to-ctk'
07e7cd63d179
Actions