Merge commit 'origin/mesa_7_5_branch' into mesa_7_6_branch
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 15 Sep 2009 20:13:35 +0000 (13:13 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 15 Sep 2009 20:13:35 +0000 (13:13 -0700)
commit6c6fe0a7040cb7355abefcd6621b67d0458311ae
tree280dcc9537106e9432ded3b737713ae3d053682d
parent5d526ed21ac9f1ec9220c2adb4c905893eb9d990
parent1f309c40b8065b8729fce631540c66e4b50b84df
Merge commit 'origin/mesa_7_5_branch' into mesa_7_6_branch
src/glx/x11/glx_pbuffer.c