Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 14 Oct 2009 15:22:30 +0000 (09:22 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 14 Oct 2009 15:22:30 +0000 (09:22 -0600)
1  2 
configure.ac
src/mesa/drivers/dri/i965/brw_draw_upload.c

diff --cc configure.ac
Simple merge