projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cc12ff bc75464)
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)
Conflicts:

src/mesa/main/bufferobj.c

1  2 
src/glx/x11/glx_pbuffer.c patch | diff1 | diff2 | blob | history

diff --cc src/glx/x11/glx_pbuffer.c
Simple merge