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

author	Thomas Balling Sørensen <tball@tball-laptop.(none)>
	Tue, 26 Oct 2010 11:01:40 +0000 (13:01 +0200)
committer	Thomas Balling Sørensen <tball@tball-laptop.(none)>
	Tue, 26 Oct 2010 11:01:40 +0000 (13:01 +0200)
commit	4926c5748028d33da4808f8a5473aa7b2f2bdc62
tree	cc899247d6a3435ce56535cffd6a4a4190eb98d8	tree
parent	dbf3a15313eed930a3d8fdde12e457259c43651b	commit \| diff
parent	97a7cf230a70c64fff300931ae7c00aa00449c97	commit \| diff

Merge branch 'pipe-video' of git://anongit.freedesktop.org/~deathsimple/xvmc-r600 into pipe-video

Conflicts:
configure.ac
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h

RSS Atom

configure.ac	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_compositor.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/Makefile	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r600/r600_pipe.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_video_context.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_defines.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_screen.h	diff1 \|	diff2 \|	blob \| history