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

[Dmitry Timoshkov]

"Sylvain Petreolle"  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.

Rewrite of Notepad using NLS(cvs tree cleanup)

[Sylvain Petreolle]

--- Dmitry Timoshkov  a écrit : >
"Sylvain Petreolle"  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

Rewrite of Notepad using NLS(cvs tree cleanup)

[Dmitry Timoshkov]

"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 ?

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

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/