Merge remote-tracking branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Mon, 11 Jul 2011 08:48:59 +0000 (10:48 +0200)
committerChristian König <deathsimple@vodafone.de>
Mon, 11 Jul 2011 08:48:59 +0000 (10:48 +0200)
commitf919547f3785b1d8839b9fc5c00ac397e30896a1
tree910cd4fd7ffcd2781a303bb79395a0ee3c044c7d
parentcd4f18089e44872ce9e3c04ac5e808a7204ffc49
parent12265d26ddc72f62de927ac24e12ab41fcd8d1c5
Merge remote-tracking branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state_inlines.h
configure.ac
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_texture.c
src/gallium/winsys/r600/drm/r600_hw_context.c