Merge branch 'T26170-Fixes'
0f948cd63087
Actions

Description

Merge branch 'T26170-Fixes'

Details

Provenance

kislinsk	Authored on Mar 27 2019, 2:37 PM
kislinsk	Pushed on Mar 27 2019, 2:37 PM

Parents

rMITKf1c4f20e8b55: Replaced MITK_USE_CppRestSdk by MITK_USE_cpprestsdk
rMITKfbb956aab244: Merge remote-tracking branch 'origin/T26191-FixBoostBuild'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK0f948cd63087: Merge branch 'T26170-Fixes' (authored by kislinsk).Mar 27 2019, 2:37 PM

Merged Changes

f1c4f20e8b55 Replaced MITK_USE_CppRestSdk by MITK_USE_cpprestsdk
Author
kislinsk
Browse Repository
No Builds
No Audits
3d95c584ebed Remove hard-coded definition of Windows version
Author
kislinsk
Browse Repository
No Builds
No Audits
b148799bdfe9 Remove artifacts from old C++ RESK SDK integration
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (35)

Path

Size

Packages

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

Classification/

CLCore/

include/

mitkConfigurationHolder.h

CLImportanceWeighting/

include/

mitkGeneralizedLinearModel.h

CommandLine/

include/

mitkCommandLineParser.h

Core/

include/

mitkGenericIDRelationRule.h

O1: MITK Reviewer Group I

mitkMimeType.h

O1: MITK Reviewer Group I

mitkPropertyKeyPath.h

O1: MITK Reviewer Group I

mitkPropertyRelationRuleBase.h

O1: MITK Reviewer Group I

mitkUIDGenerator.h

O1: MITK Reviewer Group I

mitkVtkLayerController.h

O1: MITK Reviewer Group I

CppMicroServices/

core/

include/

usLDAPFilter.h

O1: MITK Reviewer Group I

usLDAPProp.h

O1: MITK Reviewer Group I

usModuleEvent.h

O1: MITK Reviewer Group I

usModuleInfo.h

O1: MITK Reviewer Group I

usModuleVersion.h

O1: MITK Reviewer Group I

usServiceEvent.h

O1: MITK Reviewer Group I

usSharedLibrary.h

O1: MITK Reviewer Group I

CppRestSdk/

include/

CppRestSdkQt/

DicomRT/

include/

mitkRTConstants.h

DiffusionImaging/

FiberTracking/

Algorithms/

GibbsTracking/

mitkParticle.h

ImageStatistics/

mitkImageStatisticsConstants.h

O1: MITK Reviewer Group I

ModelFit/

include/

mitkModelFitConstants.h

O3: MITK Reviewer Group II

mitkModelFitStaticParameterMap.h

O3: MITK Reviewer Group II

mitkScalarListLookupTable.h

O3: MITK Reviewer Group II

RDF/

CMakeLists.txt

RTUI/

Helper/

mitkRTUIConstants.h

O4: MITK Reviewer Group III

SemanticRelations/

include/

mitkLesionData.h

Plugins/

org.blueberry.core.runtime/

src/

berryObject.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.common/

src/

internal/

QmitkNodeSelectionConstants.h

O1: MITK Reviewer Group I

SuperBuild.cmake

O1: MITK Reviewer Group I

Utilities/

mbilog/

mbilog.h

mbilogLogMessage.h

rMITK0f948cd63087

View Options

CMakeLists.txt

View Options

Modules/Classification/CLCore/include/mitkConfigurationHolder.h

View Options

Modules/Classification/CLImportanceWeighting/include/mitkGeneralizedLinearModel.h

View Options

Modules/CommandLine/include/mitkCommandLineParser.h

View Options

Modules/Core/include/mitkGenericIDRelationRule.h

View Options

Modules/Core/include/mitkMimeType.h

View Options

Modules/Core/include/mitkPropertyKeyPath.h

View Options

Modules/Core/include/mitkPropertyRelationRuleBase.h

View Options

Modules/Core/include/mitkUIDGenerator.h

View Options

Modules/Core/include/mitkVtkLayerController.h

View Options

Modules/CppMicroServices/core/include/usLDAPFilter.h

View Options

Modules/CppMicroServices/core/include/usLDAPProp.h

View Options

Modules/CppMicroServices/core/include/usModuleEvent.h

View Options

Modules/CppMicroServices/core/include/usModuleInfo.h

View Options

Modules/CppMicroServices/core/include/usModuleVersion.h

View Options

Modules/CppMicroServices/core/include/usServiceEvent.h

View Options

Modules/CppMicroServices/core/include/usSharedLibrary.h

View Options

Modules/CppRestSdk/CMakeLists.txt

View Options

Modules/CppRestSdk/include/mitkRESTManager.h

View Options

Modules/CppRestSdk/include/mitkRESTServer.h

View Options

Modules/CppRestSdkQt/CMakeLists.txt

View Options

Modules/DicomRT/include/mitkRTConstants.h

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkParticle.h

View Options

Modules/ImageStatistics/mitkImageStatisticsConstants.h

View Options

Modules/ModelFit/include/mitkModelFitConstants.h

View Options

Modules/ModelFit/include/mitkModelFitStaticParameterMap.h

View Options

Modules/ModelFit/include/mitkScalarListLookupTable.h

View Options

Modules/RDF/CMakeLists.txt

View Options

Modules/RTUI/Helper/mitkRTUIConstants.h

View Options

Modules/SemanticRelations/include/mitkLesionData.h

View Options

Plugins/org.blueberry.core.runtime/src/berryObject.h

View Options

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.h

View Options

SuperBuild.cmake

View Options

Utilities/mbilog/mbilog.h

View Options

Utilities/mbilog/mbilogLogMessage.h

Merge branch 'T26170-Fixes'0f948cd63087Actions

Description

Details

Event Timeline

Merged Changes

Changes (35)

rMITK0f948cd63087

CMakeLists.txt

Modules/Classification/CLCore/include/mitkConfigurationHolder.h

Modules/Classification/CLImportanceWeighting/include/mitkGeneralizedLinearModel.h

Modules/CommandLine/include/mitkCommandLineParser.h

Modules/Core/include/mitkGenericIDRelationRule.h

Modules/Core/include/mitkMimeType.h

Modules/Core/include/mitkPropertyKeyPath.h

Modules/Core/include/mitkPropertyRelationRuleBase.h

Modules/Core/include/mitkUIDGenerator.h

Modules/Core/include/mitkVtkLayerController.h

Modules/CppMicroServices/core/include/usLDAPFilter.h

Modules/CppMicroServices/core/include/usLDAPProp.h

Modules/CppMicroServices/core/include/usModuleEvent.h

Modules/CppMicroServices/core/include/usModuleInfo.h

Modules/CppMicroServices/core/include/usModuleVersion.h

Modules/CppMicroServices/core/include/usServiceEvent.h

Modules/CppMicroServices/core/include/usSharedLibrary.h

Modules/CppRestSdk/CMakeLists.txt

Modules/CppRestSdk/include/mitkRESTManager.h

Modules/CppRestSdk/include/mitkRESTServer.h

Modules/CppRestSdkQt/CMakeLists.txt

Modules/DicomRT/include/mitkRTConstants.h

Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkParticle.h

Modules/ImageStatistics/mitkImageStatisticsConstants.h

Modules/ModelFit/include/mitkModelFitConstants.h

Modules/ModelFit/include/mitkModelFitStaticParameterMap.h

Modules/ModelFit/include/mitkScalarListLookupTable.h

Modules/RDF/CMakeLists.txt

Modules/RTUI/Helper/mitkRTUIConstants.h

Modules/SemanticRelations/include/mitkLesionData.h

Plugins/org.blueberry.core.runtime/src/berryObject.h

Plugins/org.mitk.gui.qt.common/src/internal/QmitkNodeSelectionConstants.h

SuperBuild.cmake

Utilities/mbilog/mbilog.h

Utilities/mbilog/mbilogLogMessage.h

Merge branch 'T26170-Fixes'
0f948cd63087
Actions