[PULL] GLX and Xephyr fixes

[Eric Anholt]

Keith Packard <keithp at keithp.com> writes:

> Adam Jackson <ajax at nwnk.net> writes:
>
>> Adam Jackson (2):
>>       glx: Dynamically compute attribute slot in GetDrawableAttributes
>>       glx: Add hack for GLX-1.2-style naked windows to GetDrawableAttributes
>
> This one is a bug fix, but the other two look like new features? Do you
> think I should merge them all for 1.17?
>
>> Michele Baldessari (1):
>>       ephyr: Implement per-screen colormaps


Fixing the failure to treat colormaps as per screen seems like bugfix
territory to me.  The fix looked very obvious, too.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20141211/3cccc52e/attachment.sig>