[cairo] Device offset rework status, and what it needs from here

[Christian Biesinger]

Carl Worth wrote:
> Yes, this is known. It's just one of those subtle gradient changes
> though. And since we don't have any precise specification for
> gradients I think that's fine.
> 
> I've got a subsequent commit that cleans up these failures.

OK, cool. I still have two image test failures though (latest ps-pdf-dpi 
branch merged with cairo-origin), this time in leaky-dash and 
line-width-scale...

...but I'm told on IRC that these are known bugs. OK.

> Note: anyone that had done development off the old device-offset
> branches will need to rebase or cherry-pick their development onto the
> new master line now. This should be very straightforward as I don't
> anticipate any bad conflicts to appear.

There were some conflicts here, but at least this taught me the right 
way to resolve conflicts from git rebase ;)

The answer is: Resolve conflicts, git update-index filename, then to 
continue (no need for an explicit commit):
   git am --binary -3 -k --resolved

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 4762 bytes
Desc: S/MIME Cryptographic Signature
Url : http://lists.freedesktop.org/archives/cairo/attachments/20060505/26db49ad/smime.bin