pb: fix up merge mistakes
authorKeith Whitwell <keithw@vmware.com>
Tue, 3 Mar 2009 12:10:56 +0000 (12:10 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 3 Mar 2009 12:10:56 +0000 (12:10 +0000)
commit9a9dc422b0c491f516fd8d80e0ce128e4145698f
treeb1fa6adc3f00d2c76297f994f68975e03f382d25
parent916de35d677ca5238e9515840fa5aa9f81302c5b
pb: fix up merge mistakes
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c