Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Wed, 28 Apr 2010 13:21:25 +0000 (07:21 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 28 Apr 2010 13:21:25 +0000 (07:21 -0600)
commit1fa7789e828d1005e2473fc7cd364bd45eb30843
tree5e3e1978e6cc511e90298622b7a04840a285782d
parent37e98e5cd217075d58456753ed8450dc116fe32c
parenteecd2a59c1205246cc220ab09a79988838bb1759
Merge branch '7.8'

Conflicts:

src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
src/glx/dri2_glx.c
src/glx/dri_common.c
src/glx/drisw_glx.c
src/glx/glx_pbuffer.c
src/glx/glxclient.h
src/glx/glxcmds.c