projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d228d 68ca19a)
Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 26 Jan 2010 20:23:25 +0000 (13:23 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 26 Jan 2010 20:25:53 +0000 (13:25 -0700)
Merging was easier than cherry picking in this instance.

1  2 
src/mesa/main/fbobject.c patch | diff1 | diff2 | blob | history

diff --cc src/mesa/main/fbobject.c
Simple merge