Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 1 Jun 2009 21:01:33 +0000 (15:01 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 1 Jun 2009 21:01:33 +0000 (15:01 -0600)
commit9f6ec50f8c79283583eeebdebd16bf7dcd134816
treefe3e906dda57e8ad35137af941b0a86aa79c7031
parent1fa023ae48c31176434f5ad4691eae347e7a395f
parent0e8a5a84742adf6e99236f246c77325fad174204
Merge branch 'mesa_7_5_branch'
src/mesa/main/context.c
src/mesa/state_tracker/st_public.h