Diffusion MITK f98521ab88a1

resolved mergeconflicts
f98521ab88a1
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

resolved mergeconflicts

Details

Provenance

hentsch	Authored on Oct 13 2017, 2:51 PM
hentsch	Pushed on Oct 13 2017, 2:51 PM

Parents

rMITKfab5a1f763e8: Merge branch 'T23466-mitkChartMultipleChartTypes'
rMITK41d3b2d3f0db: Merge branch 'master' of https://phabricator.mitk.org/source/mitk

Branches

Unknown

Tags

Unknown

Event Timeline

hentsch committed rMITKf98521ab88a1: resolved mergeconflicts (authored by hentsch).Oct 13 2017, 2:51 PM

Merged Changes

41d3b2d3f0db Merge branch 'master' of https://phabricator.mitk.org/source/mitk
Author
• kirchnth
Browse Repository
No Builds
No Audits
453d5d4b1fda Merge branch 'T23538-fixAnnotationTests'
Author
• kirchnth
Browse Repository
No Builds
No Audits
68c595809ad7 COMP
Author
• kirchnth
Browse Repository
No Builds
No Audits
401e40f40f81 Merge branch 'T23537-support-dicom-spacing'
Author
• goch
Browse Repository
No Builds
No Audits
27ec5762d274 Do not fix correct spacing to wrong one
Author
• goch
Browse Repository
No Builds
No Audits
826a557223f2 Merge branch 'T23538-fixAnnotationTests'
Author
• kirchnth
Browse Repository
No Builds
No Audits
181e84362ae2 there is no mbiLogo anymore
Author
• kirchnth
Browse Repository
No Builds
No Audits
8dea9d93dccb Merge branch 'T23464-RemoveCurvesFromChart'
Author
• hempe
Browse Repository
No Builds
No Audits
788bf17edbf1 @Resolved T23464-RemoveCurvesFromChart
Author
• hempe
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

Packages

Modules/

Annotation/

test/

mitkLogoAnnotationTest.cpp

Chart/

include/

QmitkChartWidget.h

O3: MITK Reviewer Group II

src/

QmitkChartWidget.cpp

O3: MITK Reviewer Group II

DICOMReader/

src/

mitkDICOMImageBlockDescriptor.cpp

rMITKf98521ab88a1

Modules/Annotation/test/mitkLogoAnnotationTest.cpp

Loading...

Modules/Chart/include/QmitkChartWidget.h

Loading...

Modules/Chart/src/QmitkChartWidget.cpp

Loading...

Modules/DICOMReader/src/mitkDICOMImageBlockDescriptor.cpp

Loading...