[PULL] displayfd, build fix, XIQueryVersion disarmament

[Peter Hutterer]

The following changes since commit d77eb7ee49ef19c2c4c7381d56e9d0f9c3fbc890:

  Merge remote-tracking branch 'yselkowitz/master' (2012-04-19 15:48:34 -0500)

are available in the git repository at:


  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 90fe26e85f0f7b6e1aa016c7530d146c1bf224b0:

  os: Add -displayfd option (2012-04-24 10:43:53 +1000)

----------------------------------------------------------------
Chase Douglas (1):
      os: Add -displayfd option

Michal Suchanek (1):
      xserver: Fix out-of-tree build

Peter Hutterer (1):
      Xi: return BadValue on XIQueryVersion if the version is less than first call

 Xi/xiqueryversion.c                |   41 ++++++-------
 dix/globals.c                      |    1 +
 include/opaque.h                   |    1 +
 man/Xserver.man                    |    7 +++
 os/connection.c                    |   68 +++++++++++++++-------
 os/utils.c                         |    9 +++
 test/Makefile.am                   |    2 +-
 test/xi2/protocol-xiqueryversion.c |  113 ++++++++++++++++++++++++++++++++++++
 8 files changed, 201 insertions(+), 41 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120424/8b173f21/attachment.pgp>