Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 20:09:35 +0000 (14:09 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 20:09:35 +0000 (14:09 -0600)
commitfac334e6d33b0c9ffa2c5147079d728b647d0d2a
tree9a686f63025cc6a5bdfce76e7e5b18ef9cc287a0
parent4b55e3695279daef221669ff063631cf3675da0c
parent1045481dd96dec6e37f4b623b1dbae8af381de75
Merge branch 'mesa_7_5_branch'
src/mesa/main/state.c