Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sat, 11 Dec 2010 12:43:44 +0000 (13:43 +0100)
committerChristian König <deathsimple@vodafone.de>
Sat, 11 Dec 2010 12:43:44 +0000 (13:43 +0100)
commit772b25e1f366edc857e77b8c1ccdc5297d82cc41
tree88d38b52e80319dbd4a0c5b5e038d92f1105110a
parentab130400cf91ab471e265e58193c95f04c7aeeda
parentb3d2ec9942303d1d03e28a25b030eb060415abfb
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_texture.c
20 files changed:
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/vl/vl_idct.c
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r600/Makefile
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/drivers/r600/r600_texture.c
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/drivers/softpipe/sp_texture.h
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/pipe/p_video_context.h
src/gallium/state_trackers/xorg/xvmc/subpicture.c
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/winsys/g3dvl/dri/dri_winsys.c
src/gallium/winsys/g3dvl/vl_winsys.h