Merge branch 'remove-copyteximage-hook'
authorBrian Paul <brianp@vmware.com>
Thu, 21 Jul 2011 14:46:02 +0000 (08:46 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 21 Jul 2011 14:46:02 +0000 (08:46 -0600)
commitecc6a26a3d602e8b649c441077e005dfeb77aff2
tree30c9a2098a8eb92d6373c6cf2ba90e5fda0d1a00
parentafc160e1c8f87d0a76e41f1100d528d8ab82ecc4
parentd5e32397762a3bd55fa69ad6332351512083f9c6
Merge branch 'remove-copyteximage-hook'
src/mesa/drivers/common/meta.c
src/mesa/drivers/common/meta.h