Merge branch 'master' into i915-unification
authorEric Anholt <eric@anholt.net>
Thu, 24 May 2007 20:59:50 +0000 (13:59 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 24 May 2007 23:46:54 +0000 (16:46 -0700)
commitfd9d27e0686f5a15803d13d207e58be1972fdf31
tree79f8847e0fd723567032fa201d7b3ff2fdf5621d
parentb1fcabefa2f3fa81a20c1556383458315bb49bbf
parentf116aed1ede0d802e9f3c5989290002975c00330
Merge branch 'master' into i915-unification

Conflicts:

src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
src/mesa/drivers/dri/i915tex/i915_vtbl.c
src/mesa/drivers/dri/i915tex/intel_context.h
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_tex_image.c