Merge branch 'dri2'
authorKristian Høgsberg <krh@redhat.com>
Fri, 12 Oct 2007 23:35:04 +0000 (19:35 -0400)
committerKristian Høgsberg <krh@redhat.com>
Fri, 12 Oct 2007 23:35:04 +0000 (19:35 -0400)
commitf9c6dfc4d12451c21f39f38b048758cbee5723cf
tree5384315d9ec06a779137c63b54d6326dbc12ef81
parentbf805d3bf5bf191aa669b6155316a78917cf9b0e
parenta2494462cb7d557a7643452c720e0ab8fa9f4f63
Merge branch 'dri2'

Conflicts:

src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/intel_screen.c