Merge branch 'tex_combine4'
authorBrian Paul <brianp@vmware.com>
Sat, 24 Jan 2009 00:39:44 +0000 (17:39 -0700)
committerBrian Paul <brianp@vmware.com>
Sat, 24 Jan 2009 00:39:44 +0000 (17:39 -0700)
commitcba5ce166523a8bb6888a0ea28a26e30204f30a4
tree32ff5dfd46743eefa812d654a4673cc87fea359e
parent628b52241b13132e2d4065b653befdf81236e651
parent96ee3db6f76f25f8dcf36b365f6be93341d90472
Merge branch 'tex_combine4'
src/mesa/drivers/dri/intel/intel_context.c