Fw: Re: corruption of version.c in current cvs source

[Tatsuro M. <tma...@ya...>]

Hello 

I have forgotten to reply to the beta list

--- Tatsuro MATSUOKA  wrote:

> From: Tatsuro MATSUOKA 
> Subject: Re: corruption of version.c in current cvs source
> To: "Ethan Merritt" 
> Date: Sat, 26 Nov 2011 05:51:55 +0900
> 
> Hello
> 
> --- On Fri, 2011/11/25, Ethan Merritt wrote:
> 
> > On Thursday, 24 November 2011, Tatsuro MATSUOKA wrote:
> > > Hello
> > > 
> > > In cvs source dated at 2011-11-24, version.c is corrupted.  
> > > 
> > > 44: <<<<<<< version.c
> > > 45: const char gnuplot_date[] = "2011-11-12";
> > > 46: =======
> > > 47: const char gnuplot_date[] = "2011-11-24";
> > > 48: >>>>>>> 1.101
> > 
> > Could that be a merging conflict on your local machine?
> > The source files on Sourceforge contain instead:
> > 
> > 44: const char gnuplot_date{} = "November 2011";
> > 
> > I suggest that you delete that file and then repeat
> > the "cvs update" command.
> 
> > > 47: const char gnuplot_date[] = "2011-11-24";
> The part of "2011-11-24" was modified by myself.
> I have checked out the cvs source at home, no correption is found.
> 
> Anyway thank you for your reply.
> 
> Regards
> 
> Tatsuro
>