Code review comment for lp:~inkscape.dev/inkscape/lp988601

Odd set of conflicts, most of those are not files I ever worked on. This may represent lp988601 being out of sync with trunk by a couple of revisions. I have not had a chance to rebuild lp988601 locally since the last set of revisions were merged in from trunk.

That said:

Text conflict in src/extension/CMakeLists.txt
Contents conflict in src/extension/internal/emf-win32-inout.cpp
Contents conflict in src/extension/internal/emf-win32-print.cpp
Contents conflict in src/extension/internal/emf-win32-print.h

the win32 variants are not used in lp988601, it uses instead:

emf-inout
emf-print
wmf-inout
wmf-print
(all with .cpp and .h)

The conflict in CMakeLists.txt may be related to that.

The only other files in the list above which I know have been touched in lp988601 are
/src/style.cpp
/src/splivarot.cpp