Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
authorChristian König <deathsimple@vodafone.de>
Thu, 28 Oct 2010 18:24:56 +0000 (20:24 +0200)
committerChristian König <deathsimple@vodafone.de>
Thu, 28 Oct 2010 18:24:56 +0000 (20:24 +0200)
commit41ed47d6b8fb6c032e2907ef2e49e414c26f35c1
tree8cf267ee3ac5d8b530dd70a28a0d568344aa8304
parent97a7cf230a70c64fff300931ae7c00aa00449c97
parent5479fa34d9acebd55f68c23a278cf382d0e84248
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

Conflicts:
src/gallium/include/pipe/p_format.h
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/util/u_format.csv
src/gallium/drivers/r600/Makefile
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_format.h