Merge commit 'origin/master' into drm-gem
authorEric Anholt <eric@anholt.net>
Wed, 18 Jun 2008 21:07:38 +0000 (14:07 -0700)
committerEric Anholt <eric@anholt.net>
Wed, 18 Jun 2008 21:07:38 +0000 (14:07 -0700)
commit654258a4fe5e7114022c6e02f2844fc469fcc6f3
tree89d285becb87659ab61ee0ceeb35c76726ae93d2
parent64adeb163d7da6d75b5664cd2ee3783cadaf63d8
parentcf29ab3ba075905cca786b52617d7dc993f58033
Merge commit 'origin/master' into drm-gem
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_screen.c