Re: lyx-devel src/tex2lyx/: ChangeLog tex2lyx.C

2003-02-11 Thread Angus Leeming
On Tuesday 11 February 2003 2:48 pm, [EMAIL PROTECTED] wrote:
 CVSROOT:  /usr/local/lyx/cvsroot
 Module name:  lyx-devel
 Repository:   lyx-devel/src/tex2lyx/
 Changes by:   [EMAIL PROTECTED]  03/02/11 14:48:48

 Modified files:
   lyx-devel/src/tex2lyx/: ChangeLog tex2lyx.C

 Log message:
   fix compile

 Patches:
  lyx-devel/src/tex2lyx/
 
 http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/tex2lyx/ChangeLog?r1=1
.2r2=1.3
 http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/tex2lyx/tex2lyx.C?r1=1
.2r2=1.3

You didn't cvs update did you? They're already in. Could you revert this 
please?

Angus




Re: lyx-devel src/tex2lyx/: ChangeLog tex2lyx.C

2003-02-11 Thread John Levon
On Tue, Feb 11, 2003 at 01:53:29PM +, Angus Leeming wrote:

 You didn't cvs update did you?

I did (it wouldn't have let me commit otherwise).

 They're already in. Could you revert this 

Amazing that it managed to merge without conflicts. It's not normally
that lax.

john



Re: lyx-devel src/tex2lyx/: ChangeLog tex2lyx.C

2003-02-11 Thread Angus Leeming
On Tuesday 11 February 2003 2:48 pm, [EMAIL PROTECTED] wrote:
> CVSROOT:  /usr/local/lyx/cvsroot
> Module name:  lyx-devel
> Repository:   lyx-devel/src/tex2lyx/
> Changes by:   [EMAIL PROTECTED]  03/02/11 14:48:48
>
> Modified files:
>   lyx-devel/src/tex2lyx/: ChangeLog tex2lyx.C
>
> Log message:
>   fix compile
>
> Patches:
>  lyx-devel/src/tex2lyx/
> 
> http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/tex2lyx/ChangeLog?r1=1
>.2=1.3
> http://www.lyx.org/cgi-bin/viewcvs.cgi/lyx-devel/src/tex2lyx/tex2lyx.C?r1=1
>.2=1.3

You didn't cvs update did you? They're already in. Could you revert this 
please?

Angus




Re: lyx-devel src/tex2lyx/: ChangeLog tex2lyx.C

2003-02-11 Thread John Levon
On Tue, Feb 11, 2003 at 01:53:29PM +, Angus Leeming wrote:

> You didn't cvs update did you?

I did (it wouldn't have let me commit otherwise).

> They're already in. Could you revert this 

Amazing that it managed to merge without conflicts. It's not normally
that lax.

john