projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6791576 b799af9)
Merge branch 'mesa_7_5_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Sun, 14 Jun 2009 14:56:34 +0000 (16:56 +0200)
committerJakob Bornecrantz <jakob@vmware.com>
Sun, 14 Jun 2009 14:56:34 +0000 (16:56 +0200)
1  2 
progs/glsl/multitex.c patch | diff1 | diff2 | blob | history
scons/gallium.py patch | diff1 | diff2 | blob | history

diff --cc progs/glsl/multitex.c
Simple merge
diff --cc scons/gallium.py
Simple merge