Hi Didier,

are you sure this is in cvs? Or is it just the result of an update 
failed on your computer. Try to delete the whole file and update again.

Maik

Didier Fabert schrieb am 17.05.2007 14:20:
> Hi all,
>
> I notice a patch wasn't apply correctly. in mathlib.cxx line 217, you can 
> found
>
> <<<<<<< matlib.cxx
>     // The StateSets aren't actually used by the light point
>     // implementation, but it's probably dangerous not to have
>     // something in the material.
> =======
>
> and on line 276 :
>   
>>>>>>>> 1.26
>>>>>>>>                 
>
> removing this bad lines and all is OK.
>
> best regards
>
> Didier.
>
>   


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Reply via email to