Diffusion MITK 4b7cff8feffc

Merge branch 'bug-19311-vector-property'
4b7cff8feffc
Actions

Description

Merge branch 'bug-19311-vector-property'

Conflicts:
Modules/Core/test/files.cmake

Details

Provenance

maleike

Authored on Oct 13 2015, 11:34 AM

Parents

rMITK428137ae00b6: Improve mitk::VectorProperty::GetValueAsString()
rMITKb4977a31cffd: Merge branch 'bug-18280-sceneio-tests'

Branches

Unknown

Tags

Unknown

Event Timeline

maleike committed rMITK4b7cff8feffc: Merge branch 'bug-19311-vector-property' (authored by maleike).Oct 13 2015, 11:34 AM

Merged Changes

428137ae00b6 Improve mitk::VectorProperty::GetValueAsString()
Author
maleike
Browse Repository
No Builds
No Audits
c42655e940c4 Move mitk::VectorProperty from module to Core (serializer to…
Author
maleike
Browse Repository
No Builds
No Audits
5d63abcfc5b4 Add tests for typedef versions of property
Author
maleike
Browse Repository
No Builds
No Audits
74caef91575e Fix Linux warnings/errors
Author
maleike
Browse Repository
No Builds
No Audits
33281b57e39a Initial version of module VectorProperties
Author
maleike
Browse Repository
No Builds
No Audits

Changes (11)

Path

Size

Packages

Modules/

Core/

files.cmake

O1: MITK Reviewer Group I

include/

mitkVectorProperty.h

O1: MITK Reviewer Group I

src/

DataManagement/

mitkVectorProperty.cpp

O1: MITK Reviewer Group I

test/

files.cmake

O1: MITK Reviewer Group I

mitkVectorPropertyTest.cpp

O1: MITK Reviewer Group I

SceneSerializationBase/

files.cmake

O1: MITK Reviewer Group I

include/

mitkVectorPropertySerializer.h

O1: MITK Reviewer Group I

src/

mitkPropertyListSerializer.cpp

O1: MITK Reviewer Group I

test/

files.cmake

O1: MITK Reviewer Group I

mitkVectorPropertySerializerTest.cpp

O1: MITK Reviewer Group I

	Modules/	SceneSerializationBase/		src/	mitkVectorPropertySerializer.cpp/
	Examples/	Plugins/	org.mitk.example.gui.extensionpointcontribution/	src/	internal/


	ChangeTextToUpperCase.cpp

O1: MITK Reviewer Group I

rMITK4b7cff8feffc

View Options

Modules/Core/files.cmake

View Options

Modules/Core/include/mitkVectorProperty.h

View Options

Modules/Core/src/DataManagement/mitkVectorProperty.cpp

View Options

Modules/Core/test/files.cmake

View Options

Modules/Core/test/mitkVectorPropertyTest.cpp

View Options

Modules/SceneSerializationBase/files.cmake

View Options

Modules/SceneSerializationBase/include/mitkVectorPropertySerializer.h

View Options

Modules/SceneSerializationBase/src/mitkPropertyListSerializer.cpp

View Options

Modules/SceneSerializationBase/src/mitkVectorPropertySerializer.cpp

View Options

Modules/SceneSerializationBase/test/files.cmake

View Options

Modules/SceneSerializationBase/test/mitkVectorPropertySerializerTest.cpp

Merge branch 'bug-19311-vector-property'4b7cff8feffcActions

Description

Details

Event Timeline

Merged Changes

Changes (11)

rMITK4b7cff8feffc

Modules/Core/files.cmake

Modules/Core/include/mitkVectorProperty.h

Modules/Core/src/DataManagement/mitkVectorProperty.cpp

Modules/Core/test/files.cmake

Modules/Core/test/mitkVectorPropertyTest.cpp

Modules/SceneSerializationBase/files.cmake

Modules/SceneSerializationBase/include/mitkVectorPropertySerializer.h

Modules/SceneSerializationBase/src/mitkPropertyListSerializer.cpp

Modules/SceneSerializationBase/src/mitkVectorPropertySerializer.cpp

Modules/SceneSerializationBase/test/files.cmake

Modules/SceneSerializationBase/test/mitkVectorPropertySerializerTest.cpp

Merge branch 'bug-19311-vector-property'
4b7cff8feffc
Actions