fix merge conflicts
authorBrian <brian@i915.localnet.net>
Thu, 9 Aug 2007 21:42:12 +0000 (15:42 -0600)
committerBrian <brian@i915.localnet.net>
Thu, 9 Aug 2007 21:42:12 +0000 (15:42 -0600)
commitfb8caffea8ac9a8f8e2ee63959264abe8eb36c59
treea1c8c67f92e573015940af43adf05970a1f6e842
parent0c4c86cf2ce65d1284819dd14c649ac4c33cae33
fix merge conflicts
src/mesa/drivers/dri/intel_winsys/intel_buffers.c
src/mesa/drivers/dri/intel_winsys/intel_context.c