diff options
| author | Christian König <[email protected]> | 2011-01-10 23:41:08 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-10 23:41:08 +0100 |
| commit | 9032d2a13ecd019206a48767d9205c0aafa7cca2 (patch) | |
| tree | 5bd816287ab7ace941a455e02b1da7bd94571cf9 /src/gallium/drivers/i915/i915_debug.h | |
| parent | b725bbebae19890ceaaa31c1d7fb7f155ac3b6ef (diff) | |
| parent | 2b296ec77c2b95e7632b45100de5a0878ac2a294 (diff) | |
Merge remote branch 'vdpau/pipe-video' into pipe-video
Conflicts:
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_format.h
src/gallium/state_trackers/xorg/xvmc/context.c
src/gallium/tests/unit/SConscript
Diffstat (limited to 'src/gallium/drivers/i915/i915_debug.h')
0 files changed, 0 insertions, 0 deletions