Merge branch 'master' into gallium-new-formats
authorRoland Scheidegger <sroland@vmware.com>
Mon, 29 Mar 2010 23:52:13 +0000 (01:52 +0200)
committerRoland Scheidegger <sroland@vmware.com>
Mon, 29 Mar 2010 23:52:13 +0000 (01:52 +0200)
commit733df0059f04e3fd7e3265d3c80dd8029f939c60
tree5073edcb41611b86c9a62fa75c2c089fd2babf48
parent6fb364a1717858d8201b2caf234076ce5d4832ac
parent5fa09846618ed702493f054a1d4b0ec2a28fbbd0
Merge branch 'master' into gallium-new-formats

Conflicts:
src/gallium/auxiliary/util/u_format.csv
src/gallium/auxiliary/util/u_format.csv
src/gallium/drivers/i965/brw_screen_texture.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/svga/svga_screen_texture.c