diff options
| author | Michal Krol <[email protected]> | 2010-01-14 18:11:41 +0100 |
|---|---|---|
| committer | Michal Krol <[email protected]> | 2010-01-14 18:11:41 +0100 |
| commit | 5184b02b0793136a15b7edf309d79a1efe1bc73d (patch) | |
| tree | 939f7f87f623b0651e31ea84131c00630ae19f12 /progs/glsl | |
| parent | 1bc77e9931a248b74e0ef6b6aa2f4c5b2d1a2ca3 (diff) | |
| parent | ea0cc47a4f769e19ceadb9704669244f5ba53871 (diff) | |
Merge branch 'instanced-arrays'
Conflicts:
src/gallium/drivers/softpipe/sp_draw_arrays.c
Diffstat (limited to 'progs/glsl')
0 files changed, 0 insertions, 0 deletions