lp:~msoegtrop/inkscape/embroidery

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~inkscape.dev/inkscape/trunk at revision 15738

Jabiertxof: Approve (code) on 2017-06-05

Jabiertxo: Pending requested 2017-06-05

Diff: 2544 lines (+2417/-3)

11 files modified

astylerc (+4/-3)
po/POTFILES.in (+2/-0)
src/live_effects/CMakeLists.txt (+6/-0)
src/live_effects/effect-enum.h (+2/-0)
src/live_effects/effect.cpp (+10/-0)
src/live_effects/lpe-bool.cpp (+400/-0)
src/live_effects/lpe-bool.h (+63/-0)
src/live_effects/lpe-embrodery-stitch-ordering.cpp (+1139/-0)
src/live_effects/lpe-embrodery-stitch-ordering.h (+313/-0)
src/live_effects/lpe-embrodery-stitch.cpp (+400/-0)
src/live_effects/lpe-embrodery-stitch.h (+78/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

14867. By Michael Soegtrop on 2017-06-08

updated to latest trunk

14866. By Michael Soegtrop on 2017-06-05

fixed enum order + added cpp files to POFILES.in

14865. By Michael Soegtrop on 2017-06-05

merged with latest version of lpe-bool and trunk

14864. By Michael Soegtrop on 2017-06-05

updated to trunk

14863. By Michael Soegtrop on 2016-04-27

Added emboidery and bool LPEs

14862. By Tavmjong Bah on 2016-04-22

Correct enumeration names.

14861. By Jon A. Cruz on 2016-04-21

minor warning cleanup.

14860. By theAdib <email address hidden> on 2016-04-19

fix #1571365 linking on win32

14859. By Mc on 2016-04-17

Fix make check

14858. By Mc on 2016-04-17

add check for unordered_set (CMake build)