projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02c9009 2a87741)
Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Mon, 27 Oct 2008 15:37:22 +0000 (15:37 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Mon, 27 Oct 2008 15:37:22 +0000 (15:37 +0000)
1  2 
src/mesa/main/teximage.c patch | diff1 | diff2 | blob | history
src/mesa/main/texstore.c patch | diff1 | diff2 | blob | history

diff --cc src/mesa/main/teximage.c
Simple merge
diff --cc src/mesa/main/texstore.c
Simple merge