Merge branch 'bug-17623-PlanarSubdivisionPolygon-is-not-well-integrated' of…
cdbe789667a7
Actions

Description

Merge branch 'bug-17623-PlanarSubdivisionPolygon-is-not-well-integrated' of https://github.com/rkhlebnikov/MITK into bug-17623-IntegratePlanarEllipseAndSubdivisionPolygon

Conflicts:
Modules/PlanarFigure/IO/mitkPlanarFigureSubclassesSerializer.cpp
Modules/QtWidgetsExt/QmitkExt.qrc

Details

Provenance

kislinsk

Authored on Apr 22 2014, 2:11 PM

Parents

rMITK9a4e449a6371: Adding ellipse & subdivision polygon node descriptors
rMITK5c832d8cb35e: Integrated PlanarEllipse and PlanarSubdivisionPolygon into measurement toolbox.

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITKcdbe789667a7: Merge branch 'bug-17623-PlanarSubdivisionPolygon-is-not-well-integrated' of… (authored by kislinsk).Apr 22 2014, 2:11 PM

Merged Changes

9a4e449a6371 Adding ellipse & subdivision polygon node descriptors
Author
khlebnikov
Browse Repository
No Builds
No Audits
c0bb79f517f8 Adding signed-off
Author
khlebnikov
Browse Repository
No Builds
No Audits
d886bd996972 Added a serializer for PlanarSubdivisionPolygon and added icons for Ellipse and…
Author
khlebnikov
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

Packages

Modules/

QtWidgetsExt/

resources/

PlanarEllipse_48.png

O3: MITK Reviewer Group II

PlanarSubdivisionPolygon_48.png

O3: MITK Reviewer Group II

QtWidgetsExt.qrc

O3: MITK Reviewer Group II

Plugins/

org.mitk.planarfigure/

src/

internal/

mitkPlanarFigureActivator.cpp

O1: MITK Reviewer Group I

rMITKcdbe789667a7

View Options

Modules/QtWidgetsExt/resources/PlanarEllipse_48.png

View Options

Modules/QtWidgetsExt/resources/PlanarSubdivisionPolygon_48.png

View Options

Modules/QtWidgetsExt/resources/QtWidgetsExt.qrc

View Options

Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp

Merge branch 'bug-17623-PlanarSubdivisionPolygon-is-not-well-integrated' of…cdbe789667a7Actions

Description

Details

Event Timeline

Merged Changes

Changes (4)

rMITKcdbe789667a7

Modules/QtWidgetsExt/resources/PlanarEllipse_48.png

Modules/QtWidgetsExt/resources/PlanarSubdivisionPolygon_48.png

Modules/QtWidgetsExt/resources/QtWidgetsExt.qrc

Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp

Merge branch 'bug-17623-PlanarSubdivisionPolygon-is-not-well-integrated' of…
cdbe789667a7
Actions