Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sat, 8 Jan 2011 12:24:36 +0000 (13:24 +0100)
committerChristian König <deathsimple@vodafone.de>
Sat, 8 Jan 2011 12:24:36 +0000 (13:24 +0100)
commit72e30991559017c16d48569e612dbc0970e3b9ca
tree297326fa77f35b2b6f7d7d80a019562fd0facb06
parentef4def1d9a2a48c7e32ea3e6bf0294470dfbf4c8
parentd8cfe464424b41bd986276e19427f0079778bf8f
Merge remote branch 'origin/master' into pipe-video

Conflicts:
configure.ac
src/gallium/drivers/r600/eg_asm.c
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/include/pipe/p_format.h
src/gallium/targets/dri-nouveau/Makefile
13 files changed:
configure.ac
src/gallium/auxiliary/util/u_format.csv
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r600/eg_asm.c
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_sq.h
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_texture.c
src/gallium/include/pipe/p_format.h
src/gallium/targets/dri-nouveau/Makefile