Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 30 Jul 2009 14:22:57 +0000 (08:22 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 30 Jul 2009 14:22:57 +0000 (08:22 -0600)
commite87320b5e033a911d4ced2d516e479cdf1bc9228
tree897a5d5adde008de5e67a897c8c94fda5fbedbfd
parentaefaeba54a3ad7104a83ffdaf81ad9d654b990ee
parent684282953937a37541f26c6e51ceec4134c62dfb
Merge branch 'mesa_7_5_branch'
src/glx/x11/dri2_glx.c
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/state_tracker/st_cb_flush.c