Merge branch 'T23721-MasterIntegrationFixes'
201e36a92abb
Actions

Description

Merge branch 'T23721-MasterIntegrationFixes'

Details

Provenance

kislinsk	Authored on Dec 16 2017, 8:11 AM
kislinsk	Pushed on Dec 16 2017, 8:11 AM

Parents

rMITK8178ccc72b7f: Changed IIdentifiable to Identifiable and introduced UIDManipulator
rMITK310264659d6a: removed a lot of unneeded const_casts

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK201e36a92abb: Merge branch 'T23721-MasterIntegrationFixes' (authored by kislinsk).Dec 16 2017, 8:11 AM

Merged Changes

8178ccc72b7f Changed IIdentifiable to Identifiable and introduced UIDManipulator
Author
kislinsk
Browse Repository
No Builds
No Audits
27cdf9f0b768 Rename propertyName to propertyKey
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

Packages

Modules/

Core/

files.cmake

O1: MITK Reviewer Group I

include/

mitkBaseData.h

O1: MITK Reviewer Group I

mitkDataNode.h

O1: MITK Reviewer Group I

mitkIIdentifiable.h

O1: MITK Reviewer Group I

mitkIPropertyOwner.h

O1: MITK Reviewer Group I

mitkIPropertyProvider.h

O1: MITK Reviewer Group I

mitkIdentifiable.h

O1: MITK Reviewer Group I

mitkNodePredicateDataUID.h

O1: MITK Reviewer Group I

mitkNodePredicateUID.h

O1: MITK Reviewer Group I

	mitkUIDManipulator.h
	mitkIIdentifiable.h

O1: MITK Reviewer Group I

src/

DataManagement/

mitkBaseData.cpp

O1: MITK Reviewer Group I

mitkDataNode.cpp

O1: MITK Reviewer Group I

mitkIIdentifiable.cpp

O1: MITK Reviewer Group I

mitkIdentifiable.cpp

O1: MITK Reviewer Group I

mitkNodePredicateDataUID.cpp

O1: MITK Reviewer Group I

mitkNodePredicateUID.cpp

O1: MITK Reviewer Group I

	Modules/	Core/		src/	DataManagement/
	Examples/	Plugins/	org.mitk.example.gui.multipleperspectives/	src/	internal/

	mitkUIDManipulator.cpp
	EmptyView1.cpp

O1: MITK Reviewer Group I

rMITK201e36a92abb

View Options

Modules/Core/files.cmake

View Options

Modules/Core/include/mitkBaseData.h

View Options

Modules/Core/include/mitkDataNode.h

View Options

Modules/Core/include/mitkIIdentifiable.h

View Options

Modules/Core/include/mitkIPropertyOwner.h

View Options

Modules/Core/include/mitkIPropertyProvider.h

View Options

Modules/Core/include/mitkIdentifiable.h

View Options

Modules/Core/include/mitkNodePredicateDataUID.h

View Options

Modules/Core/include/mitkNodePredicateUID.h

View Options

Modules/Core/include/mitkUIDManipulator.h

View Options

Modules/Core/src/DataManagement/mitkBaseData.cpp

View Options

Modules/Core/src/DataManagement/mitkDataNode.cpp

View Options

Modules/Core/src/DataManagement/mitkIIdentifiable.cpp

View Options

Modules/Core/src/DataManagement/mitkIdentifiable.cpp

View Options

Modules/Core/src/DataManagement/mitkNodePredicateDataUID.cpp

View Options

Modules/Core/src/DataManagement/mitkNodePredicateUID.cpp

View Options

Modules/Core/src/DataManagement/mitkUIDManipulator.cpp

Merge branch 'T23721-MasterIntegrationFixes'201e36a92abbActions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITK201e36a92abb

Modules/Core/files.cmake

Modules/Core/include/mitkBaseData.h

Modules/Core/include/mitkDataNode.h

Modules/Core/include/mitkIIdentifiable.h

Modules/Core/include/mitkIPropertyOwner.h

Modules/Core/include/mitkIPropertyProvider.h

Modules/Core/include/mitkIdentifiable.h

Modules/Core/include/mitkNodePredicateDataUID.h

Modules/Core/include/mitkNodePredicateUID.h

Modules/Core/include/mitkUIDManipulator.h

Modules/Core/src/DataManagement/mitkBaseData.cpp

Modules/Core/src/DataManagement/mitkDataNode.cpp

Modules/Core/src/DataManagement/mitkIIdentifiable.cpp

Modules/Core/src/DataManagement/mitkIdentifiable.cpp

Modules/Core/src/DataManagement/mitkNodePredicateDataUID.cpp

Modules/Core/src/DataManagement/mitkNodePredicateUID.cpp

Modules/Core/src/DataManagement/mitkUIDManipulator.cpp

Merge branch 'T23721-MasterIntegrationFixes'
201e36a92abb
Actions