Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 13 May 2009 16:33:21 +0000 (10:33 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 13 May 2009 16:33:21 +0000 (10:33 -0600)
commit3039acfc5db67f3935f9c30a9f17193ab52b20a9
tree49c770f360234977c1098e3d0c373da31ac7576c
parent10c4a10b979bddd099287dec5b69243c2ade8ade
parent2e4e34689022ecfcc7dc107427db90cc52a94d63
Merge branch 'mesa_7_5_branch'

Conflicts:

src/mesa/main/arrayobj.c
src/mesa/main/arrayobj.h
src/mesa/main/context.c
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_context.h
src/mesa/main/arrayobj.h