[PULL] Xephyr, Xvfb and extmod fixes

[Daniel Stone]

Hi Keith,

The following changes since commit 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea:

  Merge remote-tracking branch 'whot/for-keith' (2012-11-18 21:50:20 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~daniels/xserver master

for you to fetch changes up to cf05db8ddec948d907915e1c9569d743e8771def:

  Ephyr: Find the right host screen when embedded (2012-11-21 11:13:55
+1100)


This was accidentally pushed to fd.o master briefly before, but I
force-reset it back after a couple of minutes.  Hopefully no-one notices
(except people reading this).

----------------------------------------------------------------
Daniel Stone (3):
      Constify argument to LoadExtension
      Constify extensions in LoadExtension users
      DMX: Add DMX and GLX extensions

Raphael Kubo da Costa (1):
      vfb: Initialize the GLX extension again.

Sjoerd Simons (1):
      Ephyr: Find the right host screen when embedded

 hw/dmx/dmx.h                       |    2 ++
 hw/dmx/dmxinit.c                   |   22 +++++++++++++++++++++-
 hw/kdrive/ephyr/hostx.c            |    4 +++-
 hw/vfb/InitOutput.c                |   19 +++++++++++++++++++
 hw/xfree86/common/xf86Extensions.c |    2 +-
 hw/xfree86/dixmods/glxmodule.c     |    2 +-
 hw/xquartz/quartz.c                |    2 +-
 include/extension.h                |    2 +-
 include/extinit.h                  |    4 ----
 mi/miinitext.c                     |    2 +-
 10 files changed, 50 insertions(+), 11 deletions(-)

Cheers,
Daniel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20121121/c6f70e70/attachment.html>