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

[Alex Beregszaszi]

Hi,

>  // ========================= 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!

-- 
Alex Beregszaszi <alex at fsn.hu>
(MPlayer Core Developer -- http://www.mplayerhq.hu/)