HomePhabricator
Diffusion MITK 91b3f990cfb4

Merge remote-tracking branch 'origin/T22234-geometry-predicate' into…
91b3f990cfb4
Actions

Description

Merge remote-tracking branch 'origin/T22234-geometry-predicate' into personal/floca/DIPP-2016-12

Conflicts:
Modules/Core/include/mitkNodePredicateGeometry.h
Modules/Core/src/DataManagement/mitkNodePredicateGeometry.cpp
Modules/Core/test/mitkNodePredicateGeometryTest.cpp

Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>

Details

Provenance
flocaAuthored on Dec 16 2016, 3:50 PM
flocaPushed on Dec 16 2016, 3:50 PM
Parents
rMITKd5ff13852292: gcc fix
rMITK39912d03f7c8: Merge remote-tracking branch 'origin/releases/2016-11-beta' into…
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (3)

PathSizePackages
Modules/
Core/
include/
O1: MITK Reviewer Group I
src/
DataManagement/
O1: MITK Reviewer Group I
test/
O1: MITK Reviewer Group I

rMITK91b3f990cfb4

View Options

Modules/Core/include/mitkNodePredicateGeometry.h

Loading...
View Options

Modules/Core/src/DataManagement/mitkNodePredicateGeometry.cpp

Loading...
View Options

Modules/Core/test/mitkNodePredicateGeometryTest.cpp

Loading...
MITK · MIC · IMSY · DKFZ