[PULL] GLX and Xephyr fixes

[Keith Packard]

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

Merged.
   3573855..1c01633  master -> master

-- 
-keith
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20150104/a4be7df7/attachment.sig>