fix merge collision
authorBrian Paul <brian.paul@tungstengraphics.com>
Fri, 16 May 2008 21:17:35 +0000 (15:17 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Fri, 16 May 2008 21:17:35 +0000 (15:17 -0600)
commitf27c6f313955b737888ce80752ee9cd895562d40
tree20357a30fb8370a7b0501d7bc9de887836c92512
parentf2632212ad7735c659331b65d3bfe14aef0faccb
fix merge collision
src/mesa/tnl/t_vp_build.c