[Mplayer-cvslog] CVS: 0_90/help help_mp-fr.h,1.37,1.38

[Diego Biurrun]

On Mon, Jul 28, 2003 at 08:46:40PM +0200, Alex Beregszaszi wrote:
> >  // ========================= Aide MPlayer ===========================
> >  
> >  #ifdef HELP_MP_DEFINE_STATIC
> > +<<<<<<< help_mp-fr.h
> > +static char* banner_text=
> > +"\n\n"
> > +"MPlayer " VERSION "(C) 2000-2003 Árpád Gereöffy (voir les DOCS)\n"
> > +"\n";
> > +
> > +=======
> > +>>>>>>> 1.37
> Arpi: reverse this asap!

Impossible, there is no CVS backup for 0_90.

Diego