Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 15:40:50 +0000 (09:40 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 22 May 2009 15:40:50 +0000 (09:40 -0600)
commit1b3f5df1e0e9ff956315262196e4947913c7f172
treed9a91c86e78909c6387446b3e46d582150760cfe
parenta545f1ab6d50e044c6e0b2d952af28e6d9059f80
parent995456f9305593005f8466520314ee087f3d422a
Merge branch 'mesa_7_5_branch'
src/mesa/main/image.c