Diffusion MITK 4e29bc7eb15e

fixed remaining merge conflicts
4e29bc7eb15e
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

fixed remaining merge conflicts

Details

Provenance

isensee	Authored on Nov 25 2016, 10:59 AM
isensee	Pushed on Nov 25 2016, 10:59 AM

Parents

rMITK1056a5b635f3: fixed merge conflicts except for displayInteractor (cpp and hpp)

Branches

Unknown

Tags

Unknown

Event Timeline

isensee committed rMITK4e29bc7eb15e: fixed remaining merge conflicts (authored by isensee).Nov 25 2016, 10:59 AM

Changes (2)

Path

Size

Packages

Modules/

Core/

include/

mitkDisplayInteractor.h

O1: MITK Reviewer Group I

src/

Interactions/

mitkDisplayInteractor.cpp

O1: MITK Reviewer Group I

rMITK4e29bc7eb15e

Modules/Core/include/mitkDisplayInteractor.h

Loading...

Modules/Core/src/Interactions/mitkDisplayInteractor.cpp

Loading...