HomePhabricator
Diffusion MITK f037558f61b5

Merge branch 'bug-8433-regBundlesToCTK'
f037558f61b5
Actions

Description

Merge branch 'bug-8433-regBundlesToCTK'

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

Details

Provenance
• vanbruggenAuthored on Jun 10 2011, 2:21 PM
Parents
rMITK7c249c3f74c9: adapted the deformable and rigid registration bundles to CTK.
rMITKce526f875b47: Merge branch 'bug-8396-TrackingToolboxAutoDetection'
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (28)

PathSize
Modules/
Bundles/
org.mitk.gui.qt.deformableregistration/
src/
internal/
internal/
org.mitk.gui.qt.deformableregistration/
src/
internal/
org.mitk.gui.qt.igttrackingtoolbox/
src/
internal/
org.mitk.gui.qt.rigidregistration/
src/
internal/
org.mitk.gui.qt.rigidregistration/
org.mitk.gui.qt.datamanager/
org.mitk.gui.qt.rigidregistration/
src/
internal/
org.mitk.core.jobs/
src/
internal/
Modules/
Bundles/
CoreUI/
BundleTesting/
org.mitk.gui.qt.deformableregistration/
src/
internal/
org.mitk.gui.qt.common.tests/
src/
internal/
org.mitk.gui.qt.rigidregistration/
src/
internal/
org.mitk.gui.qt.common.tests/
src/
internal/

rMITKf037558f61b5

View Options

Modules/Bundles/CMakeLists.txt

Loading...
View Options

Modules/Bundles/PluginList.cmake

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.deformableregistration/src/DeformableregistrationDll.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.deformableregistration/src/QmitkDeformableRegistrationView.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.deformableregistration/src/QmitkDeformableRegistrationView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.deformableregistration/src/internal/QmitkDeformableRegistrationView.cpp

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.deformableregistration/src/internal/QmitkDeformableRegistrationView.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.rigidregistration/src/RigidregistrationDll.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.rigidregistration/src/internal/QmitkRigidRegistrationSelectorView.h

Loading...
View Options

Modules/Bundles/org.mitk.gui.qt.rigidregistration/src/internal/QmitkRigidRegistrationView.h

Loading...
View Options

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

Loading...
View Options

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

Loading...
MITK · MIC · IMSY · DKFZ