projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae5487d 2fb655d)
Merge remote branch 'origin/master' into gallium_draw_llvm
authorZack Rusin <zackr@vmware.com>
Thu, 1 Apr 2010 02:16:09 +0000 (22:16 -0400)
committerZack Rusin <zackr@vmware.com>
Thu, 1 Apr 2010 02:16:09 +0000 (22:16 -0400)
1  2 
src/gallium/auxiliary/SConscript patch | diff1 | diff2 | blob | history

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