Re: rel-22 to trunk merge failures 2008-02-24

[Miles Bader]

Jason Rumney <address@hidden> writes:
>>      * w32term.c (x_draw_glyph_string_background): Clear the background
>>      manually when cleartype is in use.
>>      (x_draw_glyph_string_foreground): Draw text transparently when
>>      cleartype is in use.
>
> Applied manually (I can't see why this failed to merge automatically,
> the code was identical between the branches within about 10 lines of
> that change).

Those hunks did apply, but I reverted everything in the same file, just
in case there's some connection I don't grasp (that can still happen
across files of course, but it's usually a bit less likely I think).

-Miles

-- 
Cannon, n. An instrument employed in the rectification of national boundaries.