Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sun, 21 Nov 2010 18:40:52 +0000 (19:40 +0100)
committerChristian König <deathsimple@vodafone.de>
Sun, 21 Nov 2010 18:40:52 +0000 (19:40 +0100)
commite6b71530daea3059ee362d4df51575e27e026b22
tree8df01693aa4bf44360647d79a340cbb4156aa91a
parent42c7291d2cb50c2bd94dd9346a8402a24303d66d
parent5e3733fadf08178fca7c9f20a0f4783f940383aa
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_texture.c
src/gallium/include/pipe/p_defines.h