xserver: Branch 'master' - 5 commits

[Jeremy Huddleston]

It looks like this is causing a build regression on the tinderbox:
http://tinderbox.x.org/builds/2011-12-20-0004/logs/xserver/#build

It looks odd, so I'll take a look at it tonight, but I wanted to bring it up.

--Jeremy

 
On Dec 19, 2011, at 10:52 PM, Keith Packard wrote:

> glx/Makefile.am              |    2 
> glx/clientinfo.c             |   48 
> glx/createcontext.c          |   38 
> glx/dispatch.h               |16553 +++++++++++++++++++++++++++++++++----------
> glx/glapi.c                  |    6 
> glx/glapi_gentable.c         | 4069 +++++++---
> glx/glapioffsets.h           | 1174 ---
> glx/glapitable.h             |  883 +-
> glx/glprocs.h                | 2841 ++++---
> glx/glxext.h                 |    2 
> glx/indirect_dispatch.c      |   76 
> glx/indirect_dispatch.h      | 2035 ++---
> glx/indirect_dispatch_swap.c |   82 
> glx/indirect_program.c       |    1 
> glx/indirect_reqsize.c       |   16 
> glx/indirect_reqsize.h       |  169 
> glx/indirect_size.h          |   87 
> glx/indirect_size_get.c      |  145 
> glx/indirect_size_get.h      |  113 
> glx/indirect_table.c         |  215 
> glx/swap_interval.c          |    1 
> 21 files changed, 19670 insertions(+), 8886 deletions(-)
> 
> New commits:
> commit e4b4d83fad37bb737e25f7226dbcd15b892f9528
> Merge: 4df65d2... d26cb70...
> Author: Keith Packard <keithp at keithp.com>
> Date:   Mon Dec 19 22:36:31 2011 -0800
> 
>    Merge remote-tracking branch 'idr/glx-fixes'