git.libre-soc.org Git - mesa.git/commit

author	Christian König <deathsimple@vodafone.de>
	Thu, 24 Feb 2011 21:02:42 +0000 (22:02 +0100)
committer	Christian König <deathsimple@vodafone.de>
	Thu, 24 Feb 2011 21:02:42 +0000 (22:02 +0100)
commit	b922a0ce12916a91cfc3e56714913fcf63279ff2
tree	e24fa039925220882d155ccb987f7914e83f4372	tree
parent	f013b4f8f1329982727691a55cc263e3011d02bf	commit \| diff
parent	c0ad70ae31ee5501281b434d56e389fc92b13a3a	commit \| diff

Merge remote branch 'origin/master' into pipe-video

Conflicts:
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/drivers/r600/r600_texture.c

23 files changed:

configs/autoconf.in	diff1 \|	diff2 \|	blob \| history
configs/linux-dri	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/SConscript	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_compositor.c	diff1 \|	\|	blob \| history
src/gallium/auxiliary/vl/vl_idct.c	diff1 \|	\|	blob \| history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c	diff1 \|	\|	blob \| history
src/gallium/auxiliary/vl/vl_vertex_buffers.c	diff1 \|	\|	blob \| history
src/gallium/drivers/r600/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_asm.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_asm.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_pipe.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_shader.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_state_inlines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_format.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xvmc/subpicture.c	diff1 \|	\|	blob \| history
src/gallium/state_trackers/xorg/xvmc/surface.c	diff1 \|	\|	blob \| history
src/gallium/winsys/r600/drm/r600_bo.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

configs/autoconf.in	diff1 \|	diff2 \|	blob \| history
configs/linux-dri	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/SConscript	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_compositor.c	diff1 \|	\|	blob \| history
src/gallium/auxiliary/vl/vl_idct.c	diff1 \|	\|	blob \| history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c	diff1 \|	\|	blob \| history
src/gallium/auxiliary/vl/vl_vertex_buffers.c	diff1 \|	\|	blob \| history
src/gallium/drivers/r600/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_asm.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_asm.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_pipe.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_shader.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_state.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_state_inlines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_format.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xvmc/subpicture.c	diff1 \|	\|	blob \| history
src/gallium/state_trackers/xorg/xvmc/surface.c	diff1 \|	\|	blob \| history
src/gallium/winsys/r600/drm/r600_bo.c	diff1 \|	diff2 \|	blob \| history