projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8046846 45df4ba)
Merge remote branch 'origin/master' into pipe-video
authorYounes Manton <younes.m@gmail.com>
Sun, 7 Mar 2010 17:47:45 +0000 (12:47 -0500)
committerYounes Manton <younes.m@gmail.com>
Fri, 12 Mar 2010 06:37:49 +0000 (01:37 -0500)
commita8238bb08a95e7ea4430450c304a6bee210df1a6
tree00f4e852473dc1d6a86aece436f3e5bf89d029c7tree
parent80468464897682b8e10aeab310f20fdd7ddc6cb4commit | diff
parent45df4bad9fc0379f05197bee10c03fd351f24094commit | diff
Merge remote branch 'origin/master' into pipe-video

Conflicts:
configure.ac
src/gallium/auxiliary/vl/Makefile
src/gallium/auxiliary/vl/SConscript
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
src/gallium/drivers/nouveau/nouveau_winsys.h
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_video_state.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.h
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/g3dvl/nouveau/Makefile
17 files changed:
configure.ac diff1 | diff2 | blob | history
src/gallium/auxiliary/Makefile diff1 | diff2 | blob | history
src/gallium/auxiliary/SConscript | diff2 | blob | history
src/gallium/auxiliary/vl/vl_compositor.c diff1 | diff2 | blob | history
src/gallium/auxiliary/vl/vl_compositor.h diff1 | diff2 | blob | history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c diff1 | diff2 | blob | history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h diff1 | diff2 | blob | history
src/gallium/drivers/nv40/nv40_miptree.c diff1 | diff2 | blob | history
src/gallium/drivers/softpipe/sp_video_context.c diff1 | diff2 | blob | history
src/gallium/include/pipe/p_video_state.h diff1 | diff2 | blob | history
src/gallium/include/state_tracker/drm_api.h diff1 | diff2 | blob | history
src/gallium/state_trackers/dri/dri_context.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xvmc/surface.c diff1 | diff2 | blob | history
src/gallium/winsys/drm/nouveau/dri/Makefile diff1 | diff2 | blob | history
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c diff1 | diff2 | blob | history
src/gallium/winsys/drm/radeon/core/radeon_drm.c diff1 | diff2 | blob | history
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c diff1 | diff2 | blob | history