Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 5 Aug 2009 20:13:48 +0000 (14:13 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 5 Aug 2009 20:13:48 +0000 (14:13 -0600)
commit1f713059934c2365a42aadfdca49213b36a7de90
treee116f5f41dfde926be870dfc439a7dfbaa0ded06
parent3905119b4743eb5d284236cc237ee2c19ae3c5c8
parent5b3428d7453eec8e8a5344e22113774dea1dc456
Merge branch 'mesa_7_5_branch'

Conflicts:

src/mesa/main/state.c
progs/xdemos/glxswapcontrol.c
src/mesa/drivers/dri/intel/intel_batchbuffer.c
src/mesa/main/image.c
src/mesa/state_tracker/st_extensions.c