summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/sis
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-05-13 10:33:21 -0600
committerBrian Paul <brianp@vmware.com>2009-05-13 10:33:21 -0600
commit3039acfc5db67f3935f9c30a9f17193ab52b20a9 (patch)
tree49c770f360234977c1098e3d0c373da31ac7576c /src/mesa/drivers/dri/sis
parent10c4a10b979bddd099287dec5b69243c2ade8ade (diff)
parent2e4e34689022ecfcc7dc107427db90cc52a94d63 (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: src/mesa/main/arrayobj.c src/mesa/main/arrayobj.h src/mesa/main/context.c
Diffstat (limited to 'src/mesa/drivers/dri/sis')
0 files changed, 0 insertions, 0 deletions