projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f36846c 8042d75)
Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sat, 19 Mar 2011 00:02:40 +0000 (01:02 +0100)
committerChristian König <deathsimple@vodafone.de>
Sat, 19 Mar 2011 00:02:40 +0000 (01:02 +0100)
commit2bf95c519e755146704f4942b1703d47d18bfeaa
tree9d29c5d56014377013770615611f903cd5b25292tree
parentf36846c77ee196881c0da560229279fc7ed88170commit | diff
parent8042d751debb7a8375e8bc587189fea9a5a8371dcommit | diff
Merge remote branch 'origin/master' into pipe-video

Conflicts:
src/gallium/drivers/r600/r600_asm.c
src/gallium/tests/unit/SConscript
26 files changed:
configs/autoconf.in 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/util/u_format.csv diff1 | diff2 | blob | history
src/gallium/auxiliary/vl/vl_compositor.c diff1 | | blob | history
src/gallium/auxiliary/vl/vl_mpeg12_context.c diff1 | | blob | history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c diff1 | | blob | history
src/gallium/drivers/nvfx/nvfx_screen.c diff1 | diff2 | blob | history
src/gallium/drivers/r600/eg_asm.c 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_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/include/pipe/p_screen.h diff1 | diff2 | blob | history
src/gallium/include/pipe/p_video_context.h diff1 | | blob | history
src/gallium/state_trackers/vdpau/decode.c diff1 | | blob | history
src/gallium/state_trackers/vdpau/query.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
src/mesa/state_tracker/st_format.c diff1 | diff2 | blob | history