On Thursday 10 March 2005 18:07, Pollywog wrote: > On Thursday 10 March 2005 08:18 am, Thomas Reitelbach wrote: > > please update your cvs-sources and try again. > > delete userbox.cpp before updating. > > i guess you're experiencing a cvs conflict here. did you change something > > in this file before your last update? > > > > thomas > > It was a patch I applied a few weeks ago. The patch will not work with the > newer code, at least that is what I believe caused it, I deleted the entire > cvs and started with a new one and have no problems compiling.
The patch probably changed code which has been changed in CVS as well. This causes a cvs-conflict and you'll find things like "<<<<<<<" and "=======" and so on in your .cpp file. I believe this was, what your compiler was complaining about ;-) Bye, Thomas -- Gegen Software-Patente! http://webshop.ffii.org/ Bitte informieren Sie sich!
pgp3NDjecvX4j.pgp
Description: PGP signature
