Re: Rewrite of Notepad using NLS(cvs tree cleanup)

[Andriy Palamarchuk]

--- Sylvain Petreolle  wrote:
> --- Dmitry Timoshkov  a �crit : >
> "Sylvain Petreolle"  wrote:
> Ok, all conflicts are due to the insertion of the
> LGPL
> text in the files.
> What should I do to resolve the conflicts ?

In short - just chage the code to the form you need.
See info page for cvs for details. It provides very
good overview information for CVS usage.

Andriy Palamarchuk

__________________________________________________
Do You Yahoo!?
Yahoo! Sports - live college hoops coverage
http://sports.yahoo.com/