Rewrite of Notepad using NLS(cvs tree cleanup)
Sylvain Petreolle
spetreolle at yahoo.fr
Tue Mar 19 23:51:24 CST 2002
--- Dmitry Timoshkov <dmitry at baikal.ru> a écrit : >
"Sylvain Petreolle" <spetreolle at yahoo.fr> wrote:
>
> > Notepad now uses NLS.
> >
> > Please remove notepad.rc, that defined
> > old macro system for language resources.
>
> Please resend with resolved CVS conflicts. Search
> for
> <<<<<<< and >>>>>>> in your patch.
>
> --
> Dmitry.
Ok, all conflicts are due to the insertion of the LGPL
text in the files.
What should I do to resolve the conflicts ?
___________________________________________________________
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français !
Yahoo! Mail : http://fr.mail.yahoo.com
More information about the wine-devel
mailing list