Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Thu, 4 Jun 2009 19:16:13 +0000 (13:16 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 4 Jun 2009 19:16:13 +0000 (13:16 -0600)
commit9d58724c51c387c360d2423e29b80ddc0bfa66b7
tree774f69454bca802e1fe8e20ebb2a130843ca8123
parent81a0ef3f2068448a8b544826eaa7d3382b9c769b
parent9424d81d18770f0c436f0876dffe07cf7c094db4
Merge branch 'mesa_7_5_branch'

Conflicts:

src/mesa/main/context.c
src/mesa/main/context.c