diff options
author | Maciej Cencora <m.cencora@gmail.com> | 2009-08-15 00:52:44 +0200 |
---|---|---|
committer | Maciej Cencora <m.cencora@gmail.com> | 2009-08-15 00:52:44 +0200 |
commit | a89963cec1b5872d620c73ed8a5e54b10e3bf28b (patch) | |
tree | e2fa5270cb5b7e7c4f5f5a85bdfcaead5d5b49e0 /src/mesa/drivers/dri/sis/sis_lock.c | |
parent | 71b1610941f9bfefa01d827fd19cc2368e6cdae3 (diff) | |
parent | 7fe0dd2e6e927e4ec3e532e08aa0551ebaec4cc1 (diff) |
Merge branch 'vbo_clean'
Conflicts:
src/mesa/drivers/dri/r300/r300_draw.c
Diffstat (limited to 'src/mesa/drivers/dri/sis/sis_lock.c')
0 files changed, 0 insertions, 0 deletions