diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:01:40 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 13:01:40 +0200 |
| commit | 4926c5748028d33da4808f8a5473aa7b2f2bdc62 (patch) | |
| tree | cc899247d6a3435ce56535cffd6a4a4190eb98d8 /src/glx/xfont.c | |
| parent | dbf3a15313eed930a3d8fdde12e457259c43651b (diff) | |
| parent | 97a7cf230a70c64fff300931ae7c00aa00449c97 (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
Diffstat (limited to 'src/glx/xfont.c')
0 files changed, 0 insertions, 0 deletions