summaryrefslogtreecommitdiffstats
path: root/src/mesa/vbo/vbo_rebase.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-11-04 17:57:20 -0700
committerBrian Paul <[email protected]>2009-11-04 17:57:20 -0700
commit898de4a9d5e47ed32c600e5907476fd9338aa7e9 (patch)
treeb06ee62e20bbf0cc5dbfd55b8315c4c409eb45ec /src/mesa/vbo/vbo_rebase.c
parentfe86f8d73268785b31bc8d5a278a233bff42034d (diff)
parent1c3f7ab74ce492d6c92f2e3a0f29957fa9a71d96 (diff)
Merge branch 'mesa_7_6_branch'
Conflicts: src/mesa/drivers/windows/gdi/mesa.def
Diffstat (limited to 'src/mesa/vbo/vbo_rebase.c')
0 files changed, 0 insertions, 0 deletions