Merge remote branch 'origin/mesa_7_6_branch'
authorEric Anholt <eric@anholt.net>
Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)
committerEric Anholt <eric@anholt.net>
Fri, 13 Nov 2009 22:45:29 +0000 (14:45 -0800)
commit3d36d6b4cf735e93a6ae5eadf28e671252fb5303
tree429a4ad66dfcea3a4d3b9c1f3135425250eec75b
parent99077e77927ec26edf85bfef81a6d433171c3a1e
parent514544f373b6e6fae11b7b4426949b8ad64c441b
Merge remote branch 'origin/mesa_7_6_branch'
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/brw_sf_state.c
src/mesa/drivers/dri/i965/brw_wm_emit.c