Mesa (master): Merge branch 'draw-instanced'
Brian Paul
brianp at kemper.freedesktop.org
Sat Jan 15 17:25:56 UTC 2011
Module: Mesa
Branch: master
Commit: 652901e95b4ed406293d0e1fabee857c054119b1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=652901e95b4ed406293d0e1fabee857c054119b1
Author: Brian Paul <brianp at vmware.com>
Date: Sat Jan 15 10:24:08 2011 -0700
Merge branch 'draw-instanced'
Conflicts:
src/gallium/auxiliary/draw/draw_llvm.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/glsl/ir_set_program_inouts.cpp
src/mesa/tnl/t_vb_program.c
---
More information about the mesa-commit
mailing list