[PULL v2] XResource extension v1.2

[Erkki Seppala]

On 17.04.2012 18:20, Alan Coopersmith wrote:
>> They seem to apply fine, and there haven't been updated, so yes. However, I'm
>> wondering on which tree the server side is integrated into, not on
>> fdo/xorg/xserver master surely? Or then my git-fu is too poor :).
>
> Oh, erm, I could have sworn they were.   So really only the resourceproto
> stuff made it into git?   How inconsistent of us.   Am I forgetting some

Hey, at least it got into the release notes!

> reason the rest of the bits didn't go forward once that landed, or did we
> all just drop the ball?

Probably the ball was just misplaced at some point. However, I've now 
rebased my xserver patches against master successfully. I'll still check 
that they apply&compile patch-by-patch and that I haven't messed up with 
the rebase.