Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 13 Jul 2009 14:47:37 +0000 (08:47 -0600)
commit9615daa9324341f6a56932dc46b807f402d18283
tree611f086092443717c44bc31f29bb0f311b0d9d24
parentbb4c70358778f28f644ae493b5d8163e76e9fddb
parent680f7d09b00fdec0dbe5e357639d6b445bb9266e
Merge branch 'mesa_7_5_branch'
configure.ac
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/vbo/vbo_save_api.c