[PULL] 1.12 fix queue

[Jeremy Huddleston]

Another (cleaner) option is to just branch xserver-1.12-branch from ed8f3c4bd17bddf1369d050ea8e63b9451d887ce (the commit before ajax's changes landed) and let master chug along towards 1.13.

If these do get reverted rather than doing a branch, ajax, please squash the two patches I just sent to the list into your tree.

On Jan 9, 2012, at 8:55 PM, Adam Jackson wrote:

> On 1/9/12 5:42 PM, Keith Packard wrote:
>> On Mon, 9 Jan 2012 14:07:27 -0800, Aaron Plattner<aplattner at nvidia.com>  wrote:
>> 
>>> Keith, this merge includes some major ABI breakers (e.g. changes to
>>> ClientRec).  Whatever happened to the "ABI is frozen at RC1" policy?
>> 
>> Ajax? Was this sequence intended for 1.13?
>> 
> 
> The ABI changes were intended for 1.12, but were in a tree that never got pulled.  I'd express some frustration that changes I send never get review or pull notice, but it's as much or more my fault for not being persistent or leading enough by example.
> 
> Most of the ABI changes are easy to revert, and I guess I don't really care if they go in now or later.  The r/R convention change depends on 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96 though, which would be a little unfortunate to lose.  Oh well.
> 
> Anyway.  Revert these commits (in this order):
> 
> a4553019a10b4e01cc06f3081db71a83338697b4
> 48e7a2ef574c8b38c4f8f07b45f54c8bfd02552b
> 78fa121f4097d29458e5453c13473595df06e26e
> 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96
> f702372822dadb1fef92cfc25086481f640147b3
> d5f724544afd2949cebfcf4f0b4510ec0c701bec
> 
> - ajax
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel