1. 09 May, 2010 2 commits
  2. 01 May, 2010 1 commit
    • Younes Manton's avatar
      Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video · a8ea1dac
      Younes Manton authored
      Conflicts:
      	src/gallium/auxiliary/Makefile
      	src/gallium/auxiliary/SConscript
      	src/gallium/auxiliary/util/u_format.csv
      	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/identity/id_objects.c
      	src/gallium/drivers/identity/id_objects.h
      	src/gallium/drivers/identity/id_screen.c
      	src/gallium/drivers/nv40/Makefile
      	src/gallium/drivers/nv40/nv40_screen.c
      	src/gallium/drivers/softpipe/sp_texture.c
      	src/gallium/drivers/softpipe/sp_texture.h
      	src/gallium/drivers/softpipe/sp_video_context.c
      	src/gallium/drivers/softpipe/sp_video_context.h
      	src/gallium/include/pipe/p_format.h
      	src/gallium/include/pipe/p_screen.h
      	src/gallium/include/pipe/p_video_context.h
      	src/gallium/include/pipe/p_video_state.h
      	src/gallium/include/state_tracker/dri1_api.h
      	src/gallium/include/state_tracker/drm_api.h
      	src/gallium/state_trackers/dri/common/dri_context.c
      	src/gallium/state_trackers/xorg/xvmc/attributes.c
      	src/gallium/state_trackers/xorg/xvmc/block.c
      	src/gallium/state_trackers/xorg/xvmc/context.c
      	src/gallium/state_trackers/xorg/xvmc/subpicture.c
      	src/gallium/state_trackers/xorg/xvmc/surface.c
      	src/gallium/state_trackers/xorg/xvmc/tests/.gitignore
      	src/gallium/state_trackers/xorg/xvmc/tests/Makefile
      	src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
      	src/gallium/winsys/drm/radeon/core/radeon_drm.c
      	src/gallium/winsys/g3dvl/vl_winsys.h
      	src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
      	src/gallium/winsys/sw/Makefile
      a8ea1dac
  3. 28 Apr, 2010 1 commit
  4. 25 Apr, 2010 1 commit
  5. 24 Apr, 2010 3 commits
  6. 19 Apr, 2010 3 commits
  7. 28 Apr, 2010 29 commits