[PULL] xserver-next, 2011-04-15

[Adam Jackson]

The following changes since commit b3d2164a0361f636bfe77b51456bee9213af4f13:

   dri2: Pass out_count by value to update_dri2_drawable_buffers() 
(2011-04-14 15:21:57 +0300)

are available in the git repository at:
   ssh://people.freedesktop.org/~ajax/xserver.git xserver-next

Adam Jackson (4):
       glx: Fix lifetime tracking for pixmaps
       Revert "composite: Don't backfill non-bg-None windows"
       glx: Use 0 rather than garbage for unknown INTEL_swap_event types
       glx: Make --disable-dri not disable AIGLX

  composite/compalloc.c |   26 --------------------------
  configure.ac          |    2 +-
  glx/Makefile.am       |    5 ++++-
  glx/glxcmds.c         |   11 +++++++----
  glx/glxdri2.c         |    1 +
  glx/glxext.c          |   22 +++++++++++++---------
  6 files changed, 26 insertions(+), 41 deletions(-)

- ajax