Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorBrian Paul <brianp@vmware.com>
Tue, 22 Sep 2009 19:44:43 +0000 (13:44 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 22 Sep 2009 19:44:43 +0000 (13:44 -0600)
commitba002eb1965ccdb09d7c3657d32e22e71ed4096a
tree883c15ca428980c27624f4ba3f5fd1bd421e4718
parent8cc12ffb34769a84050be034d19921af811a3406
parentbc7546476078dd520af4853f6f0d3f577ec670ec
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:

src/mesa/main/bufferobj.c
src/glx/x11/glx_pbuffer.c