Recent CVS conflicts with FreeBSD

2001-08-29 Thread R. Lahaye
Hi, After I've upgraded to the latest CVS (August 30th 2001), the make ends with an error message complaining about not finding wchar.h. Indeed this file (and all other wc*.h include files) are missing on a FreeBSD system and is not (yet?) to be included either acoording to messages on the Fr

Re: CVS conflicts

2001-06-13 Thread Juergen Vigna
On 12-Jun-2001 Lars Gullik Bjønnes wrote: >| when running "cvs update", I got a conflict in po/POTFILES.in. How is that >| possible? Does it make sense to put a file into the repository that is >| modified during compilation? > > perhaps not... > I tend to think that this file should be under m

Re: CVS conflicts

2001-06-12 Thread Lars Gullik Bjønnes
Michael Schmitt <[EMAIL PROTECTED]> writes: | | when running "cvs update", I got a conflict in po/POTFILES.in. How is that | possible? Does it make sense to put a file into the repository that is | modified during compilation? perhaps not... I tend to think that this file should be under manual

CVS conflicts

2001-06-12 Thread Michael Schmitt
Hi, when running "cvs update", I got a conflict in po/POTFILES.in. How is that possible? Does it make sense to put a file into the repository that is modified during compilation? cvs server: Updating po RCS file: /cvs/lyx/lyx-devel/po/POTFILES.in,v retrieving revision 1.181 retrieving revision 1