Merge branch 'vbo_clean'
authorMaciej Cencora <m.cencora@gmail.com>
Fri, 14 Aug 2009 22:52:44 +0000 (00:52 +0200)
committerMaciej Cencora <m.cencora@gmail.com>
Fri, 14 Aug 2009 22:52:44 +0000 (00:52 +0200)
commita89963cec1b5872d620c73ed8a5e54b10e3bf28b
treee2fa5270cb5b7e7c4f5f5a85bdfcaead5d5b49e0
parent71b1610941f9bfefa01d827fd19cc2368e6cdae3
parent7fe0dd2e6e927e4ec3e532e08aa0551ebaec4cc1
Merge branch 'vbo_clean'

Conflicts:
src/mesa/drivers/dri/r300/r300_draw.c
src/mesa/drivers/dri/r300/r300_draw.c