Merge commit 'origin/master' into drm-gem
authorEric Anholt <eric@anholt.net>
Tue, 24 Jun 2008 21:08:08 +0000 (14:08 -0700)
committerEric Anholt <eric@anholt.net>
Tue, 24 Jun 2008 21:08:08 +0000 (14:08 -0700)
commitf6abe8f0f2fba3073b58b96ed38aae163c765b4a
tree706ba29d021fb1e4c54500e8773e3dda5f9ff6e8
parenta42dac187973cbc17be6c59db89264cbc935ab91
parent5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea
Merge commit 'origin/master' into drm-gem
src/mesa/drivers/dri/i915/Makefile
src/mesa/drivers/dri/i915/i830_context.c
src/mesa/drivers/dri/i915/i915_context.c
src/mesa/drivers/dri/i965/Makefile
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/drivers/dri/intel/intel_pixel_draw.c