Diffusion MITK 6f85cc97869f

Merge remote-tracking branch 'origin/bug-12051-surface-interpolation-undo…
6f85cc97869f
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge remote-tracking branch 'origin/bug-12051-surface-interpolation-undo-redo' into bug-12051-undo-redo-for-interpolation-integration

Conflicts:
Modules/Segmentation/Interactions/mitkSegTool2D.cpp
Modules/SurfaceInterpolation/Testing/mitkSurfaceInterpolationControllerTest.cpp
Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp
Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Details

Provenance

Authored on Oct 13 2014, 8:36 AM

Parents

rMITK5923baa2c560: PlaneGeometry is now const for surface interpolation
rMITK19a4bbb26e69: COMP: Merge branch 'bug-18253-cppmicroservices-update'

Branches

Unknown

Tags

Unknown

Event Timeline

• fetzer committed rMITK6f85cc97869f: Merge remote-tracking branch 'origin/bug-12051-surface-interpolation-undo… (authored by • fetzer).Oct 13 2014, 8:36 AM

Merged Changes

5923baa2c560 PlaneGeometry is now const for surface interpolation
Author
• fetzer
Browse Repository
No Builds
No Audits
39b4a5decfd6 Undo/Redo for surface interpolation
Author
• fetzer
Browse Repository
No Builds
No Audits
0be252d301b4 Merge branch 'bug-16775-live-wire-with-3d-interpolation' into…
Author
• fetzer
Browse Repository
No Builds
No Audits

Changes (6)

Path

Size

Packages

Modules/

Segmentation/

Algorithms/

mitkDiffSliceOperationApplier.cpp

O1: MITK Reviewer Group I

Interactions/

mitkSegTool2D.cpp

O1: MITK Reviewer Group I

mitkSegTool2D.h

O1: MITK Reviewer Group I

SurfaceInterpolation/

Testing/

mitkSurfaceInterpolationControllerTest.cpp

mitkSurfaceInterpolationController.cpp

mitkSurfaceInterpolationController.h

rMITK6f85cc97869f

Modules/Segmentation/Algorithms/mitkDiffSliceOperationApplier.cpp

Loading...

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

Loading...

Modules/Segmentation/Interactions/mitkSegTool2D.h

Loading...

Modules/SurfaceInterpolation/Testing/mitkSurfaceInterpolationControllerTest.cpp

Loading...

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

Loading...

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.h

Loading...