[PULL] Minor cleanup

[Keith Packard]

Jeremy Huddleston Sequoia <jeremyhu at apple.com> writes:

> Jeremy Huddleston Sequoia (3):
>       XQuartz: Ensure <dix-config.h> is included in capabilities.c
>       os: Ensure <dix-config.h> is included in strndup.c
>       XORG_TLS: Pick the first option that works (ie: prefer __thread)

Merged.
   9a35d42..9064294  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130214/37d929b3/attachment.pgp>