Merge branch 'vbo-0.2'
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 2 Feb 2007 12:26:10 +0000 (12:26 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 2 Feb 2007 12:26:10 +0000 (12:26 +0000)
commitb59657ad965f9471574e914b861bb1d2a17d772e
tree99a4fe6dc933472516de91773da04034626a84b5
parent325196f548f8e46aa8fcc7b030e81ba939e7f6b7
parent2ddc8799a8e243cb10cd69ea9424f72b6c4de534
Merge branch 'vbo-0.2'

Conflicts:

src/mesa/main/texcompress_s3tc.c
src/mesa/tnl/t_array_api.c
12 files changed:
src/mesa/drivers/directfb/idirectfbgl_mesa.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/i965/intel_context.c
src/mesa/drivers/dri/nouveau/nouveau_context.c
src/mesa/drivers/dri/nouveau/nouveau_state.c
src/mesa/drivers/dri/r300/r300_context.c
src/mesa/drivers/dri/r300/r300_render.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/x11/xm_api.c
src/mesa/main/context.c
src/mesa/main/dlist.c