Diffusion MITK b25379a2817c

Merge branch 'bug-12770-ToolLandmarksForNavigationTools'
b25379a2817c
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-12770-ToolLandmarksForNavigationTools'

Conflicts:
Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

Details

Provenance

Authored on Aug 1 2012, 12:12 PM

Parents

rMITKfe6813b70832: extended test by a method for testing saving/loading of tools with stored…
rMITK3ba361852743: Merge branch 'bug-12759-skip-unrequested-tests'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITKb25379a2817c: Merge branch 'bug-12770-ToolLandmarksForNavigationTools' (authored by franza).Aug 1 2012, 12:12 PM

Merged Changes

Changes (8)

Path

Size

Modules/

IGT/

IGTToolManagement/

mitkNavigationTool.cpp

mitkNavigationTool.h

mitkNavigationToolReader.cpp

mitkNavigationToolReader.h

mitkNavigationToolWriter.cpp

mitkNavigationToolWriter.h

Testing/

mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

mitkNavigationToolTest.cpp

rMITKb25379a2817c

Modules/IGT/IGTToolManagement/mitkNavigationTool.cpp

Loading...

Modules/IGT/IGTToolManagement/mitkNavigationTool.h

Loading...

Modules/IGT/IGTToolManagement/mitkNavigationToolReader.cpp

Loading...

Modules/IGT/IGTToolManagement/mitkNavigationToolReader.h

Loading...

Modules/IGT/IGTToolManagement/mitkNavigationToolWriter.cpp

Loading...

Modules/IGT/IGTToolManagement/mitkNavigationToolWriter.h

Loading...

Modules/IGT/Testing/mitkNavigationToolStorageSerializerAndDeserializerTest.cpp

Loading...

Modules/IGT/Testing/mitkNavigationToolTest.cpp

Loading...