Merge branch 'mesa_7_7_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 13:56:56 +0000 (14:56 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 13:56:56 +0000 (14:56 +0100)
commitcc8a537c57a62a196106b592e510e4c93bd1826e
tree626155e23277d9660c0a1787a94b63d969e93c6d
parent7fc75ef7d43038385b5fba73a67f1e4783b045d6
parent0c75854cc1650dc870e042aa66a053e70b3d4556
Merge branch 'mesa_7_7_branch'
src/mesa/drivers/dri/intel/intel_extensions.c
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/state_tracker/st_mesa_to_tgsi.c