Merge branch 'master' into pipe-video
authorThomas Balling Sørensen <tball@tball-laptop.(none)>
Tue, 26 Oct 2010 10:49:41 +0000 (12:49 +0200)
committerThomas Balling Sørensen <tball@tball-laptop.(none)>
Tue, 26 Oct 2010 10:49:41 +0000 (12:49 +0200)
commitdbf3a15313eed930a3d8fdde12e457259c43651b
tree78bc54fa866ff1e97e61802f52dabe3f4f3380b1
parent1dccc4cfaa423f15ab582d2a0253a84a0ae0b9fa
parent547e7619aac74ae13bdaa7fdf403a4ceb5212467
Merge branch 'master' into pipe-video

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