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

Donnie Berkholz spyderous at gentoo.org
Fri Mar 31 18:04:27 PST 2006


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



More information about the xorg mailing list