Merge lp://staging/~liampwhite/inkscape/inkscape into lp://staging/inkscape/experimental
Proposed by
Liam P. White
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 13545 | ||||||||
Proposed branch: | lp://staging/~liampwhite/inkscape/inkscape | ||||||||
Merge into: | lp://staging/inkscape/experimental | ||||||||
Diff against target: |
12144 lines (+10546/-196) 97 files modified
po/POTFILES.in (+15/-0) src/Makefile_insert (+3/-0) src/attributes.cpp (+2/-0) src/attributes.h (+2/-0) src/display/cairo-utils.cpp (+1/-3) src/display/cairo-utils.h (+3/-0) src/display/drawing-item.cpp (+3/-2) src/display/sp-canvas.cpp (+1/-1) src/interface.cpp (+11/-0) src/interface.h (+1/-0) src/knotholder.cpp (+25/-11) src/live_effects/CMakeLists.txt (+13/-0) src/live_effects/Makefile_insert (+16/-0) src/live_effects/effect-enum.h (+7/-0) src/live_effects/effect.cpp (+71/-6) src/live_effects/effect.h (+11/-0) src/live_effects/lpe-attach-path.cpp (+198/-0) src/live_effects/lpe-attach-path.h (+52/-0) src/live_effects/lpe-bounding-box.cpp (+67/-0) src/live_effects/lpe-bounding-box.h (+37/-0) src/live_effects/lpe-ellipse_5pts.cpp (+214/-0) src/live_effects/lpe-ellipse_5pts.h (+50/-0) src/live_effects/lpe-fill-between-many.cpp (+78/-0) src/live_effects/lpe-fill-between-many.h (+36/-0) src/live_effects/lpe-fill-between-strokes.cpp (+116/-0) src/live_effects/lpe-fill-between-strokes.h (+38/-0) src/live_effects/lpe-jointype.cpp (+184/-0) src/live_effects/lpe-jointype.h (+45/-0) src/live_effects/lpe-knot.cpp (+4/-0) src/live_effects/lpe-knot.h (+2/-1) src/live_effects/lpe-powerstroke-interpolators.h (+40/-0) src/live_effects/lpe-powerstroke.cpp (+89/-11) src/live_effects/lpe-powerstroke.h (+2/-0) src/live_effects/lpe-tangent_to_curve.cpp (+8/-11) src/live_effects/lpe-tangent_to_curve.h (+0/-1) src/live_effects/lpe-taperstroke.cpp (+630/-0) src/live_effects/lpe-taperstroke.h (+72/-0) src/live_effects/parameter/Makefile_insert (+4/-0) src/live_effects/parameter/filletchamferpointarray.cpp (+3/-0) src/live_effects/parameter/originalpatharray.cpp (+497/-0) src/live_effects/parameter/originalpatharray.h (+123/-0) src/live_effects/parameter/powerstrokepointarray.cpp (+36/-7) src/live_effects/parameter/powerstrokepointarray.h (+21/-2) src/live_effects/parameter/transformedpoint.cpp (+182/-0) src/live_effects/parameter/transformedpoint.h (+87/-0) src/live_effects/pathoutlineprovider.cpp (+795/-0) src/live_effects/pathoutlineprovider.h (+55/-0) src/menus-skeleton.h (+3/-0) src/path-chemistry.cpp (+8/-0) src/selection-chemistry.cpp (+159/-48) src/selection-chemistry.h (+1/-0) src/snap.cpp (+1/-1) src/sp-item-group.cpp (+12/-0) src/sp-item-group.h (+8/-0) src/sp-item.cpp (+40/-0) src/sp-item.h (+15/-0) src/sp-lpe-item.cpp (+8/-2) src/sp-object.h (+1/-0) src/sp-tag-use-reference.cpp (+156/-0) src/sp-tag-use-reference.h (+78/-0) src/sp-tag-use.cpp (+206/-0) src/sp-tag-use.h (+55/-0) src/sp-tag.cpp (+154/-0) src/sp-tag.h (+57/-0) src/ui/dialog/Makefile_insert (+6/-0) src/ui/dialog/calligraphic-profile-rename.h (+1/-1) src/ui/dialog/color-item.cpp (+2/-0) src/ui/dialog/dialog-manager.cpp (+6/-0) src/ui/dialog/filedialog.h (+1/-0) src/ui/dialog/lpe-powerstroke-properties.cpp (+211/-0) src/ui/dialog/lpe-powerstroke-properties.h (+99/-0) src/ui/dialog/objects.cpp (+2144/-0) src/ui/dialog/objects.h (+263/-0) src/ui/dialog/swatches.cpp (+32/-75) src/ui/dialog/swatches.h (+0/-2) src/ui/dialog/tags.cpp (+1165/-0) src/ui/dialog/tags.h (+181/-0) src/ui/tool/multi-path-manipulator.cpp (+3/-3) src/ui/tool/multi-path-manipulator.h (+1/-1) src/ui/tools/node-tool.cpp (+2/-1) src/ui/tools/pen-tool.cpp (+3/-1) src/ui/widget/Makefile_insert (+11/-2) src/ui/widget/addtoicon.cpp (+157/-0) src/ui/widget/addtoicon.h (+98/-0) src/ui/widget/clipmaskicon.cpp (+184/-0) src/ui/widget/clipmaskicon.h (+102/-0) src/ui/widget/filter-effect-chooser.cpp (+2/-0) src/ui/widget/filter-effect-chooser.h (+3/-1) src/ui/widget/highlight-picker.cpp (+214/-0) src/ui/widget/highlight-picker.h (+90/-0) src/ui/widget/insertordericon.cpp (+173/-0) src/ui/widget/insertordericon.h (+100/-0) src/ui/widget/layertypeicon.cpp (+174/-0) src/ui/widget/layertypeicon.h (+108/-0) src/verbs.cpp (+92/-1) src/verbs.h (+5/-0) src/widgets/desktop-widget.cpp (+1/-1) |
||||||||
To merge this branch: | bzr merge lp://staging/~liampwhite/inkscape/inkscape | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Owens | Approve | ||
Johan Engelen | Pending | ||
Review via email:
|
Description of the change
Proposing to merge to watch progression of diff.
To post a comment you must log in.
I've passed along a few clean up points over irc and I can't spot anything really bad. So I'm going ahead with a merge.