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)
commitce3801ab87ef6eb29e5b81c2acfdd102f7b9c0ae
tree6eef465b806f82b085ce30a31a514c0ffabf72d3
parent98eb7a14a44f8e5c3c2d2f1418d7d4e4ed0fe5e8
parent115edf24a9128b79dfa5f30482c990e2cb898357
Merge branch 'mesa_7_6_branch'
configure.ac
src/mesa/drivers/dri/i965/brw_draw_upload.c