Merge commit 'origin/mesa_7_7_branch'
authorKeith Whitwell <keithw@vmware.com>
Tue, 1 Dec 2009 10:57:37 +0000 (10:57 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 1 Dec 2009 10:57:37 +0000 (10:57 +0000)
commit06d3732a9094030fc33120f16f162e0d405f132c
tree185159951093f49f1877e78eaf01f6d1ea01e560
parent853d4807fe220b17cf5af5a76b24f2466238013b
parentf17dbe256bb38c35d885260be7e5856f1561de97
Merge commit 'origin/mesa_7_7_branch'

Conflicts:
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/main/texgetimage.c
src/mesa/main/version.h
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/gallium/state_trackers/xorg/xorg_renderer.c
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/radeon/radeon_dma.c
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c