Merge branch 'arb_map_buffer_range'
authorBrian Paul <brianp@vmware.com>
Mon, 15 Jun 2009 22:42:42 +0000 (16:42 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 15 Jun 2009 22:42:42 +0000 (16:42 -0600)
commit70d247c69bcef4f40b640ae61e9fb9ebc5887bb6
tree12c7b32a969b64f4a1ef2324f2321e673634295c
parent01f7bda44c92268fa288bbd8f53af3a3620bd315
parent8d0f72e8f901e12841408b95963d43684fb6ce48
Merge branch 'arb_map_buffer_range'

Conflicts:

docs/relnotes-7.6.html
src/mesa/main/mtypes.h
docs/relnotes-7.6.html
src/mesa/drivers/common/driverfuncs.c
src/mesa/main/bufferobj.c
src/mesa/state_tracker/st_extensions.c