projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 441344b 77af109)
Merge branch 'sprite-coord'
authorBrian Paul <brianp@vmware.com>
Tue, 21 Sep 2010 15:57:25 +0000 (09:57 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 21 Sep 2010 15:57:25 +0000 (09:57 -0600)
1  2 
src/gallium/auxiliary/Makefile patch | diff1 | diff2 | blob | history
src/gallium/auxiliary/SConscript patch | diff1 | diff2 | blob | history

diff --cc src/gallium/auxiliary/Makefile
Simple merge
diff --cc src/gallium/auxiliary/SConscript
Simple merge