xgl-0-0-1 branch xorg/GL/glx/glxdri.c merge errors

Ioannis Nousias s0238762 at sms.ed.ac.uk
Sat Apr 1 03:20:06 PST 2006

Donnie Berkholz wrote:
> Ioannis Nousias wrote:
>> it appears that after some cvs merge operation some "<<<<<<<" 
>> characters were left over in glxdri.c file. Check lines 180 and 210-211
> I suspect that's due to some local patch you applied, as I don't see 
> any merge remnants in either HEAD or the Xgl branch.
> HTH,
> Donnie
you are right! it must have been a cvs update that I did. I should have 
checked this more thoroughly before sending this to the list. sorry 
about that!


More information about the xorg mailing list