Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 3 Nov 2009 16:54:09 +0000 (09:54 -0700)
commit4bced42341d13303ae023957d3001a640cf7ea2d
tree2bbfe5c00a876ea5342ec81713b2ff6006adccd8
parent800e553e7a1703e33e54f45d0638b67001665fc5
parenta0cd2b7029e1ac6699b807baa255e7fd2abe7f54
Merge branch 'mesa_7_6_branch'
configure.ac
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_texture.c