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)
commit61d3a66456852642ed8fdc1106dc0012e4b89779
treefc102d28aa5711bf9569a3963a05ab6a337df559
parent02c9009bb842cd8a47bc36ea274ef54ff47e1528
parent2a877411dbe35abdd8c15fb4821d9232619d89cc
Merge commit 'origin/master' into gallium-0.2
src/mesa/main/teximage.c
src/mesa/main/texstore.c