[Gimp-print-devel] Trying to minimize unnecessary differences between mainline and branch

[Robert Krawitz]

I've pushed some changes to the mainline and will shortly to the
branch to eliminate unnecessary differences between the mainline and
the brnach.

The most notable change is to print-olympus.c. A lot of the paper
sizes have a point added to them on the mainline to round the size up;
this isn't needed on the branch. I replaced constructs such as

PT(1236,300)+1

with

PT1(1236,300)

that expands appropriately in both places. This will make merging
changes in that area easier.