Merge branch 'origin' into i915-unification
authorEric Anholt <eric@anholt.net>
Thu, 21 Jun 2007 21:14:24 +0000 (14:14 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 21 Jun 2007 21:14:24 +0000 (14:14 -0700)
commit4fe48b4e8568896cdbc822323aeec0a41c72ff2a
treea32edaa514931bad2364b3877302eeaa3847131e
parent5d9dc02cbecd94f822f853fd01878784596f4eba
parented5ed6fe2f64f45eb3a43f9c57037d9e9b7fa5ea
Merge branch 'origin' into i915-unification
src/mesa/drivers/dri/i915tex/i830_vtbl.c
src/mesa/drivers/dri/i915tex/intel_context.c
src/mesa/drivers/dri/i915tex/intel_context.h
src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_tex_image.c
src/mesa/drivers/dri/i965/intel_context.c