Rewrite of Notepad using NLS(cvs tree cleanup)

Dmitry Timoshkov dmitry at
Wed Mar 20 00:21:13 CST 2002

"Sylvain Petreolle" <spetreolle at> wrote:

> Ok, all conflicts are due to the insertion of the LGPL
> text in the files.
> What should I do to resolve the conflicts ?

Apparently manually edit your (patched) sources and produce
new correct diff file.


More information about the wine-devel mailing list