Merge branch 'const-buffer-changes'
authorBrian Paul <brianp@vmware.com>
Fri, 1 May 2009 15:37:14 +0000 (09:37 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 1 May 2009 15:37:14 +0000 (09:37 -0600)
commitb9196c1fa39dd566c5d7ab340e353b77714edb5f
treeecc4f85989f40699ccd118a00af63f68273fcb22
parent3f25219c7bf0f090502489928f0f018e62c4f6cf
parentdca190e9432d4ed122bdd534922d0c3d85791c6a
Merge branch 'const-buffer-changes'

Conflicts:

src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/i915/i915_context.c
src/mesa/drivers/dri/i965/brw_curbe.c
src/mesa/drivers/dri/i965/brw_vs_emit.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/drivers/dri/r300/r300_state.c