fix merge
authorkeithw <keithw@keithw-laptop.(none)>
Wed, 26 Sep 2007 11:10:46 +0000 (12:10 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Thu, 27 Sep 2007 06:56:23 +0000 (07:56 +0100)
commit035a824730ae3804b2bfaadec94015aac5c6ebcc
tree8aaab4767327cccdc183e68fc2c6da4dd04de92b
parentc5cfa639880d5309a2276dc0c47a73ca0752d696
fix merge
src/mesa/pipe/draw/draw_feedback.c