summaryrefslogtreecommitdiff
path: root/progs/xdemos/corender.c
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-12-15 12:38:01 -0800
committerIan Romanick <ian.d.romanick@intel.com>2009-12-15 12:38:01 -0800
commit11522b74b318db9d099466ff226124c23595e8e2 (patch)
tree2f57b1d594a9f6c223b002f1c549ea5f799b37cc /progs/xdemos/corender.c
parentb90f7f3ad324b1e4c39e334cdeb9556c3eb808ab (diff)
parentf23d01e726a57cd6b8e31f1049ee5853773df7ea (diff)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
Diffstat (limited to 'progs/xdemos/corender.c')
0 files changed, 0 insertions, 0 deletions