Fix merge issue
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 10 Aug 2007 09:20:35 +0000 (10:20 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 10 Aug 2007 09:20:35 +0000 (10:20 +0100)
commit07fd9ad7bbd6de8d2beaa5202daecb7dac861899
treec5456b8745eaa8c4d3f9edc444e1c61fbb5290cd
parentfa6815f0566339eb0879842369d3aea25dc6233f
Fix merge issue
src/mesa/drivers/dri/intel_winsys/intel_context.c
src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c