intel: fix additional merge conflicts missed in previous commit
authorBrian Paul <brianp@vmware.com>
Wed, 24 Jun 2009 14:57:48 +0000 (08:57 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 24 Jun 2009 14:57:48 +0000 (08:57 -0600)
commitbc5c40d7d99a51f5b6080bf85080e4984e528dfd
tree01ec0a76de26f5ba4e968b1c73c2b26bf80b86c4
parenta04af335a42ce3b28e59ff9b85b2bd433a9d7b12
intel: fix additional merge conflicts missed in previous commit
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/drivers/dri/intel/intel_pixel_draw.c