Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 22:01:26 +0000 (16:01 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 24 Sep 2009 22:01:26 +0000 (16:01 -0600)
commit940ca2e837efe45caae1cf1d9665f6736347705d
tree3b37fc690165007ac57c71ebc025556c8dfe5c7e
parent726a04a2cd1bf159a6c40584b4b2b9bc5948a82e
parent1730b8db1237485778abdc4ae37e122414b5423b
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/enable.c