Merge branch '7.8'
authorMichel Dänzer <daenzer@vmware.com>
Fri, 23 Apr 2010 09:18:29 +0000 (11:18 +0200)
committerMichel Dänzer <michel@daenzer.net>
Fri, 23 Apr 2010 09:18:29 +0000 (11:18 +0200)
commitff20543c815a14fddad1efaaef1610454a1924d4
treef65f496edc940c7bbd5c56601ec003a653cfb0aa
parent749a8825a00c841b677eabace88d8d3f2ad7af13
parentc37e275e778e8c944e3dfad159b1eb94c601af60
Merge branch '7.8'
src/glx/dri2_glx.c
src/mesa/drivers/dri/radeon/radeon_screen.c