summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorMichal Krol <[email protected]>2010-01-14 18:11:41 +0100
committerMichal Krol <[email protected]>2010-01-14 18:11:41 +0100
commit5184b02b0793136a15b7edf309d79a1efe1bc73d (patch)
tree939f7f87f623b0651e31ea84131c00630ae19f12 /src/mesa/tnl
parent1bc77e9931a248b74e0ef6b6aa2f4c5b2d1a2ca3 (diff)
parentea0cc47a4f769e19ceadb9704669244f5ba53871 (diff)
Merge branch 'instanced-arrays'
Conflicts: src/gallium/drivers/softpipe/sp_draw_arrays.c
Diffstat (limited to 'src/mesa/tnl')
0 files changed, 0 insertions, 0 deletions