Diffusion MITK 3a3578f078c4

Merge branch 'bug-8433-pointbasedregistrationCTK'
3a3578f078c4
Actions

Description

Merge branch 'bug-8433-pointbasedregistrationCTK'

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

Details

Provenance

• vanbruggen

Authored on Jun 20 2011, 11:02 AM

Parents

rMITK869aae69b90c: switched point based registration to CTK
rMITKfc7b26eb814f: Merge branch 'bug-8539-fix-highres-screenshots'

Branches

Unknown

Tags

Unknown

Event Timeline

• vanbruggen committed rMITK3a3578f078c4: Merge branch 'bug-8433-pointbasedregistrationCTK' (authored by • vanbruggen).Jun 20 2011, 11:02 AM

Merged Changes

869aae69b90c switched point based registration to CTK
Author
• vanbruggen
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Modules/

Bundles/

CMakeLists.txt

PluginList.cmake

org.mitk.gui.qt.pointbasedregistration/

src/

PointbasedregistrationDll.h

internal/

QmitkPointBasedRegistrationView.h

	org.mitk.gui.qt.pointbasedregistration/
	org.mitk.gui.qt.deformableregistration/

manifest_headers.cmake

src/

internal/

mitkPluginActivator.cpp

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

mitkPluginActivator.h

rMITK3a3578f078c4

View Options

Modules/Bundles/CMakeLists.txt

View Options

Modules/Bundles/PluginList.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/Bundles/org.mitk.gui.qt.pointbasedregistration/src/PointbasedregistrationDll.h

View Options

Modules/Bundles/org.mitk.gui.qt.pointbasedregistration/src/internal/QmitkPointBasedRegistrationView.h

View Options

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

View Options

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

Merge branch 'bug-8433-pointbasedregistrationCTK'3a3578f078c4Actions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITK3a3578f078c4

Modules/Bundles/CMakeLists.txt

Modules/Bundles/PluginList.cmake

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

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

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

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

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

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

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

Modules/Bundles/org.mitk.gui.qt.pointbasedregistration/src/PointbasedregistrationDll.h

Modules/Bundles/org.mitk.gui.qt.pointbasedregistration/src/internal/QmitkPointBasedRegistrationView.h

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

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

Merge branch 'bug-8433-pointbasedregistrationCTK'
3a3578f078c4
Actions